From 3b44fbe4d9eef124f84f756d99983928a29679f5 Mon Sep 17 00:00:00 2001 From: Pepijn Olivier Date: Tue, 26 Jul 2022 15:00:47 +0200 Subject: [PATCH 01/63] Add PHP 8.1 to the docs --- .../content/DockerImages/dockerfiles/include/image-tag-php.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index 9663715d3..0f8123394 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -8,6 +8,7 @@ Tag Distribution name PHP Version ``7.3`` *customized official php image* PHP 7.3 ``7.4`` *customized official php image* PHP 7.4 ``8.0`` *customized official php image* PHP 8.0 +``8.1`` *customized official php image* PHP 8.1 ``7.1-alpine`` *customized official php image* PHP 7.1 ``7.2-alpine`` *customized official php image* PHP 7.2 ``7.3-alpine`` *customized official php image* PHP 7.3 From 264fec7cd8649b38b76eae29639abb08bea833b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 12 Dec 2022 15:35:31 +0100 Subject: [PATCH 02/63] task: deprecate 7.3, build 8.2 --- .gitlab-ci.yml | 702 +++++------------- ci/BLACKLIST | 3 +- docker/php-official/8.2-alpine/Dockerfile | 2 +- .../php-official/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-official/8.2/Dockerfile | 2 +- docker/php-official/8.2/Dockerfile.jinja2 | 4 +- 6 files changed, 212 insertions(+), 503 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e6634b4d..2c9310592 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,12 +52,12 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_62ae1ba202ebf8.23879831' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba202ebf8.23879831' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_62ae1ba202ebf8.23879831' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_62ae1ba202ebf8.23879831' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_63973bcba23bb9.02658083' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba23bb9.02658083' + - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba23bb9.02658083' + - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba23bb9.02658083' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDJlYmY4LjIzODc5ODMxIn0= Dockerfile_62ae1ba202ebf8.23879831' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTIzYmI5LjAyNjU4MDgzIn0= Dockerfile_63973bcba23bb9.02658083' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -79,12 +79,12 @@ stages: - 'cd docker/certbot/latest' - 'docker build --no-cache -t webdevops/certbot:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/certbot:latest" >> Dockerfile_62ae1ba202f2c2.04598715' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba202f2c2.04598715' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_62ae1ba202f2c2.04598715' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_62ae1ba202f2c2.04598715' + - 'echo "FROM webdevops/certbot:latest" >> Dockerfile_63973bcba23fa7.06095486' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba23fa7.06095486' + - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba23fa7.06095486' + - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba23fa7.06095486' - 'bundle install' - - 'bash serverspec.sh spec/docker/certbot_spec.rb webdevops/certbot:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2NlcnRib3Q6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjEiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAyZjJjMi4wNDU5ODcxNSJ9 Dockerfile_62ae1ba202f2c2.04598715' + - 'bash serverspec.sh spec/docker/certbot_spec.rb webdevops/certbot:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2NlcnRib3Q6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjEiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyM2ZhNy4wNjA5NTQ4NiJ9 Dockerfile_63973bcba23fa7.06095486' - 'docker push webdevops/certbot:latest' - 'docker tag webdevops/certbot:latest $CI_REGISTRY_IMAGE/certbot:latest' - 'docker push $CI_REGISTRY_IMAGE/certbot:latest' @@ -104,10 +104,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_62ae1ba202f972.64851360' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba202f972.64851360' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_63973bcba24399.55995570' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24399.55995570' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAyZjk3Mi42NDg1MTM2MCJ9 Dockerfile_62ae1ba202f972.64851360' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNDM5OS41NTk5NTU3MCJ9 Dockerfile_63973bcba24399.55995570' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -129,10 +129,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_62ae1ba202fcf0.63058592' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba202fcf0.63058592' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63973bcba245a1.64825325' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba245a1.64825325' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMmZjZjAuNjMwNTg1OTIifQ== Dockerfile_62ae1ba202fcf0.63058592' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjQ1YTEuNjQ4MjUzMjUifQ== Dockerfile_63973bcba245a1.64825325' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -154,10 +154,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_62ae1ba2030118.72612316' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2030118.72612316' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_63973bcba247b9.88455226' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba247b9.88455226' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzAxMTguNzI2MTIzMTYifQ== Dockerfile_62ae1ba2030118.72612316' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjQ3YjkuODg0NTUyMjYifQ== Dockerfile_63973bcba247b9.88455226' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -177,10 +177,10 @@ stages: - 'cd docker/nginx-dev/alpine' - 'docker build --no-cache -t webdevops/nginx-dev:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx-dev:alpine" >> Dockerfile_62ae1ba2030477.05236927' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2030477.05236927' + - 'echo "FROM webdevops/nginx-dev:alpine" >> Dockerfile_63973bcba249c3.11013734' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba249c3.11013734' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx-dev_spec.rb webdevops/nginx-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54LWRldjphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDMwNDc3LjA1MjM2OTI3In0= Dockerfile_62ae1ba2030477.05236927' + - 'bash serverspec.sh spec/docker/nginx-dev_spec.rb webdevops/nginx-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54LWRldjphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI0OWMzLjExMDEzNzM0In0= Dockerfile_63973bcba249c3.11013734' - 'docker push webdevops/nginx-dev:alpine' - 'docker tag webdevops/nginx-dev:alpine $CI_REGISTRY_IMAGE/nginx-dev:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx-dev:alpine' @@ -200,10 +200,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_62ae1ba20307d1.50121791' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20307d1.50121791' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_63973bcba24bb1.19606717' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24bb1.19606717' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDMwN2QxLjUwMTIxNzkxIn0= Dockerfile_62ae1ba20307d1.50121791' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI0YmIxLjE5NjA2NzE3In0= Dockerfile_63973bcba24bb1.19606717' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -223,10 +223,10 @@ stages: - 'cd docker/apache-dev/alpine' - 'docker build --no-cache -t webdevops/apache-dev:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache-dev:alpine" >> Dockerfile_62ae1ba2030bf4.15597669' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2030bf4.15597669' + - 'echo "FROM webdevops/apache-dev:alpine" >> Dockerfile_63973bcba24dc2.25856506' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24dc2.25856506' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache-dev_spec.rb webdevops/apache-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZS1kZXY6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzMGJmNC4xNTU5NzY2OSJ9 Dockerfile_62ae1ba2030bf4.15597669' + - 'bash serverspec.sh spec/docker/apache-dev_spec.rb webdevops/apache-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZS1kZXY6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNGRjMi4yNTg1NjUwNiJ9 Dockerfile_63973bcba24dc2.25856506' - 'docker push webdevops/apache-dev:alpine' - 'docker tag webdevops/apache-dev:alpine $CI_REGISTRY_IMAGE/apache-dev:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache-dev:alpine' @@ -246,11 +246,11 @@ stages: - 'cd docker/varnish/latest' - 'docker build --no-cache -t webdevops/varnish:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/varnish:latest" >> Dockerfile_62ae1ba2030f65.29108542' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2030f65.29108542' - - 'echo "ENV VARNISH_BACKEND_HOST webdevops.io" >> Dockerfile_62ae1ba2030f65.29108542' + - 'echo "FROM webdevops/varnish:latest" >> Dockerfile_63973bcba24fc5.73027503' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24fc5.73027503' + - 'echo "ENV VARNISH_BACKEND_HOST webdevops.io" >> Dockerfile_63973bcba24fc5.73027503' - 'bundle install' - - 'bash serverspec.sh spec/docker/varnish_spec.rb webdevops/varnish:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Zhcm5pc2g6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzMGY2NS4yOTEwODU0MiJ9 Dockerfile_62ae1ba2030f65.29108542' + - 'bash serverspec.sh spec/docker/varnish_spec.rb webdevops/varnish:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Zhcm5pc2g6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNGZjNS43MzAyNzUwMyJ9 Dockerfile_63973bcba24fc5.73027503' - 'docker push webdevops/varnish:latest' - 'docker tag webdevops/varnish:latest $CI_REGISTRY_IMAGE/varnish:latest' - 'docker push $CI_REGISTRY_IMAGE/varnish:latest' @@ -270,12 +270,12 @@ stages: - 'cd docker/bootstrap/ubuntu-20.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-20.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-20.04" >> Dockerfile_62ae1ba2034553.53812156' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2034553.53812156' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_62ae1ba2034553.53812156' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_62ae1ba2034553.53812156' + - 'echo "FROM webdevops/bootstrap:ubuntu-20.04" >> Dockerfile_63973bcba26ed2.42172274' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba26ed2.42172274' + - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba26ed2.42172274' + - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba26ed2.42172274' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNDU1My41MzgxMjE1NiJ9 Dockerfile_62ae1ba2034553.53812156' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNmVkMi40MjE3MjI3NCJ9 Dockerfile_63973bcba26ed2.42172274' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-20.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-20.04' @@ -299,10 +299,10 @@ stages: - 'cd docker/base/ubuntu-20.04' - 'docker build --no-cache -t webdevops/base:ubuntu-20.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-20.04" >> Dockerfile_62ae1ba20348d7.41915951' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20348d7.41915951' + - 'echo "FROM webdevops/base:ubuntu-20.04" >> Dockerfile_63973bcba27105.41893738' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27105.41893738' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIwLjA0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIwLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzQ4ZDcuNDE5MTU5NTEifQ== Dockerfile_62ae1ba20348d7.41915951' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIwLjA0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIwLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjcxMDUuNDE4OTM3MzgifQ== Dockerfile_63973bcba27105.41893738' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-20.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-20.04' @@ -326,10 +326,10 @@ stages: - 'cd docker/base-app/ubuntu-20.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-20.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-20.04" >> Dockerfile_62ae1ba2034c65.77584306' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2034c65.77584306' + - 'echo "FROM webdevops/base-app:ubuntu-20.04" >> Dockerfile_63973bcba27329.98226231' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27329.98226231' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMC4wNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6InVidW50dS0yMC4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDM0YzY1Ljc3NTg0MzA2In0= Dockerfile_62ae1ba2034c65.77584306' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMC4wNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6InVidW50dS0yMC4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI3MzI5Ljk4MjI2MjMxIn0= Dockerfile_63973bcba27329.98226231' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-20.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-20.04' @@ -353,10 +353,10 @@ stages: - 'cd docker/php/ubuntu-20.04' - 'docker build --no-cache -t webdevops/php:ubuntu-20.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:ubuntu-20.04" >> Dockerfile_62ae1ba2034ff4.84111125' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2034ff4.84111125' + - 'echo "FROM webdevops/php:ubuntu-20.04" >> Dockerfile_63973bcba27548.82653387' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27548.82653387' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNGZmNC44NDExMTEyNSJ9 Dockerfile_62ae1ba2034ff4.84111125' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzU0OC44MjY1MzM4NyJ9 Dockerfile_63973bcba27548.82653387' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:ubuntu-20.04 --config php/test.yaml' - 'docker push webdevops/php:ubuntu-20.04' @@ -380,10 +380,10 @@ stages: - 'cd docker/php-nginx/ubuntu-20.04' - 'docker build --no-cache -t webdevops/php-nginx:ubuntu-20.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:ubuntu-20.04" >> Dockerfile_62ae1ba2035394.75228567' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2035394.75228567' + - 'echo "FROM webdevops/php-nginx:ubuntu-20.04" >> Dockerfile_63973bcba27770.49046260' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27770.49046260' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNTM5NC43NTIyODU2NyJ9 Dockerfile_62ae1ba2035394.75228567' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzc3MC40OTA0NjI2MCJ9 Dockerfile_63973bcba27770.49046260' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:ubuntu-20.04 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:ubuntu-20.04' @@ -407,10 +407,10 @@ stages: - 'cd docker/mail-sandbox/latest' - 'docker build --no-cache -t webdevops/mail-sandbox:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/mail-sandbox:latest" >> Dockerfile_62ae1ba20357c2.10169417' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20357c2.10169417' + - 'echo "FROM webdevops/mail-sandbox:latest" >> Dockerfile_63973bcba279b7.82185517' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba279b7.82185517' - 'bundle install' - - 'bash serverspec.sh spec/docker/mail-sandbox_spec.rb webdevops/mail-sandbox:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL21haWwtc2FuZGJveDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNTdjMi4xMDE2OTQxNyJ9 Dockerfile_62ae1ba20357c2.10169417' + - 'bash serverspec.sh spec/docker/mail-sandbox_spec.rb webdevops/mail-sandbox:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL21haWwtc2FuZGJveDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzliNy44MjE4NTUxNyJ9 Dockerfile_63973bcba279b7.82185517' - 'docker push webdevops/mail-sandbox:latest' - 'docker tag webdevops/mail-sandbox:latest $CI_REGISTRY_IMAGE/mail-sandbox:latest' - 'docker push $CI_REGISTRY_IMAGE/mail-sandbox:latest' @@ -448,10 +448,10 @@ stages: - 'cd docker/ssh/latest' - 'docker build --no-cache -t webdevops/ssh:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/ssh:latest" >> Dockerfile_62ae1ba2035e67.65319168' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2035e67.65319168' + - 'echo "FROM webdevops/ssh:latest" >> Dockerfile_63973bcba27dd0.44079133' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27dd0.44079133' - 'bundle install' - - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNWU2Ny42NTMxOTE2OCJ9 Dockerfile_62ae1ba2035e67.65319168' + - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyN2RkMC40NDA3OTEzMyJ9 Dockerfile_63973bcba27dd0.44079133' - 'docker push webdevops/ssh:latest' - 'docker tag webdevops/ssh:latest $CI_REGISTRY_IMAGE/ssh:latest' - 'docker push $CI_REGISTRY_IMAGE/ssh:latest' @@ -471,10 +471,10 @@ stages: - 'cd docker/postfix/latest' - 'docker build --no-cache -t webdevops/postfix:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/postfix:latest" >> Dockerfile_62ae1ba20361d6.06709825' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20361d6.06709825' + - 'echo "FROM webdevops/postfix:latest" >> Dockerfile_63973bcba27fe3.49628457' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27fe3.49628457' - 'bundle install' - - 'bash serverspec.sh spec/docker/postfix_spec.rb webdevops/postfix:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Bvc3RmaXg6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzYxZDYuMDY3MDk4MjUifQ== Dockerfile_62ae1ba20361d6.06709825' + - 'bash serverspec.sh spec/docker/postfix_spec.rb webdevops/postfix:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Bvc3RmaXg6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjdmZTMuNDk2Mjg0NTcifQ== Dockerfile_63973bcba27fe3.49628457' - 'docker push webdevops/postfix:latest' - 'docker tag webdevops/postfix:latest $CI_REGISTRY_IMAGE/postfix:latest' - 'docker push $CI_REGISTRY_IMAGE/postfix:latest' @@ -494,10 +494,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_62ae1ba2036547.17992910' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2036547.17992910' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63973bcba281f3.81433975' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba281f3.81433975' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImxhdGVzdCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDM2NTQ3LjE3OTkyOTEwIn0= Dockerfile_62ae1ba2036547.17992910' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImxhdGVzdCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI4MWYzLjgxNDMzOTc1In0= Dockerfile_63973bcba281f3.81433975' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -517,10 +517,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_62ae1ba2044e90.36554726' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2044e90.36554726' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63973bcba2f3f0.22809859' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f3f0.22809859' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDRlOTAuMzY1NTQ3MjYifQ== Dockerfile_62ae1ba2044e90.36554726' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMmYzZjAuMjI4MDk4NTkifQ== Dockerfile_63973bcba2f3f0.22809859' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -544,10 +544,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_62ae1ba2045252.18152996' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045252.18152996' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63973bcba2f626.20557655' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f626.20557655' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ1MjUyLjE4MTUyOTk2In0= Dockerfile_62ae1ba2045252.18152996' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmNjI2LjIwNTU3NjU1In0= Dockerfile_63973bcba2f626.20557655' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -567,10 +567,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_62ae1ba20455b3.99571255' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20455b3.99571255' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63973bcba2f813.52155543' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f813.52155543' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0NTViMy45OTU3MTI1NSJ9 Dockerfile_62ae1ba20455b3.99571255' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyZjgxMy41MjE1NTU0MyJ9 Dockerfile_63973bcba2f813.52155543' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -590,10 +590,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_62ae1ba2045928.06893180' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045928.06893180' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63973bcba2fa03.12422849' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fa03.12422849' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDU5MjguMDY4OTMxODAifQ== Dockerfile_62ae1ba2045928.06893180' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMmZhMDMuMTI0MjI4NDkifQ== Dockerfile_63973bcba2fa03.12422849' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -615,10 +615,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_62ae1ba2045cb3.93553676' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045cb3.93553676' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63973bcba2fc26.57048267' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fc26.57048267' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ1Y2IzLjkzNTUzNjc2In0= Dockerfile_62ae1ba2045cb3.93553676' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmYzI2LjU3MDQ4MjY3In0= Dockerfile_63973bcba2fc26.57048267' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -638,10 +638,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_62ae1ba2046027.70997251' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2046027.70997251' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63973bcba2fe54.73894217' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fe54.73894217' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ2MDI3LjcwOTk3MjUxIn0= Dockerfile_62ae1ba2046027.70997251' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmZTU0LjczODk0MjE3In0= Dockerfile_63973bcba2fe54.73894217' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -663,10 +663,10 @@ stages: - 'cd docker/php-official/7.4-alpine' - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_62ae1ba2048db3.48660323' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2048db3.48660323' + - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63973bcba30cd2.53266589' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba30cd2.53266589' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ4ZGIzLjQ4NjYwMzIzIn0= Dockerfile_62ae1ba2048db3.48660323' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMwY2QyLjUzMjY2NTg5In0= Dockerfile_63973bcba30cd2.53266589' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - 'docker push webdevops/php:7.4-alpine' @@ -690,10 +690,10 @@ stages: - 'cd docker/php-apache/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_62ae1ba2049144.06257099' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049144.06257099' + - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63973bcba30ee8.79644046' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba30ee8.79644046' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OTE0NC4wNjI1NzA5OSJ9 Dockerfile_62ae1ba2049144.06257099' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMGVlOC43OTY0NDA0NiJ9 Dockerfile_63973bcba30ee8.79644046' - 'docker push webdevops/php-apache:7.4-alpine' - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' @@ -713,10 +713,10 @@ stages: - 'cd docker/php-apache-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_62ae1ba2049538.05686224' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049538.05686224' + - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63973bcba310d6.78385701' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba310d6.78385701' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDk1MzguMDU2ODYyMjQifQ== Dockerfile_62ae1ba2049538.05686224' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzEwZDYuNzgzODU3MDEifQ== Dockerfile_63973bcba310d6.78385701' - 'docker push webdevops/php-apache-dev:7.4-alpine' - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' @@ -736,10 +736,10 @@ stages: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_62ae1ba20498a2.34874878' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20498a2.34874878' + - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63973bcba312c8.45677744' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba312c8.45677744' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ5OGEyLjM0ODc0ODc4In0= Dockerfile_62ae1ba20498a2.34874878' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMxMmM4LjQ1Njc3NzQ0In0= Dockerfile_63973bcba312c8.45677744' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4-alpine' @@ -761,10 +761,10 @@ stages: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_62ae1ba2049c74.86686736' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049c74.86686736' + - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_63973bcba31504.46929271' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba31504.46929271' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OWM3NC44NjY4NjczNiJ9 Dockerfile_62ae1ba2049c74.86686736' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMTUwNC40NjkyOTI3MSJ9 Dockerfile_63973bcba31504.46929271' - 'docker push webdevops/php-nginx-dev:7.4-alpine' - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' @@ -784,10 +784,10 @@ stages: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_62ae1ba2049fc7.62230106' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049fc7.62230106' + - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63973bcba316f1.85062130' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba316f1.85062130' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OWZjNy42MjIzMDEwNiJ9 Dockerfile_62ae1ba2049fc7.62230106' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMTZmMS44NTA2MjEzMCJ9 Dockerfile_63973bcba316f1.85062130' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4-alpine' @@ -797,152 +797,6 @@ stages: - aws needs: - 'webdevops/php:7.4-alpine' -'webdevops/php:7.3': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-official/7.3' - - 'docker build --no-cache -t webdevops/php:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.3" >> Dockerfile_62ae1ba204b939.72468156' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204b939.72468156' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjMiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGI5MzkuNzI0NjgxNTYifQ== Dockerfile_62ae1ba204b939.72468156' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.3 --config php/test.yaml' - - 'docker push webdevops/php:7.3' - - 'docker tag webdevops/php:7.3 $CI_REGISTRY_IMAGE/php:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php:7.3' - - 'docker tag webdevops/php:7.3 webdevops/php-official:7.3' - - 'docker push webdevops/php-official:7.3' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-apache:7.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-apache/7.3' - - 'docker build --no-cache -t webdevops/php-apache:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.3" >> Dockerfile_62ae1ba204bcc7.62011658' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204bcc7.62011658' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny4zIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRiY2M3LjYyMDExNjU4In0= Dockerfile_62ae1ba204bcc7.62011658' - - 'docker push webdevops/php-apache:7.3' - - 'docker tag webdevops/php-apache:7.3 $CI_REGISTRY_IMAGE/php-apache:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.3' - tags: - - aws - needs: - - 'webdevops/php:7.3' -'webdevops/php-apache-dev:7.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-apache-dev/7.3' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.3" >> Dockerfile_62ae1ba204c094.89016812' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204c094.89016812' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuMyIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0YzA5NC44OTAxNjgxMiJ9 Dockerfile_62ae1ba204c094.89016812' - - 'docker push webdevops/php-apache-dev:7.3' - - 'docker tag webdevops/php-apache-dev:7.3 $CI_REGISTRY_IMAGE/php-apache-dev:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.3' - tags: - - aws - needs: - - 'webdevops/php-apache:7.3' -'webdevops/php-nginx:7.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-nginx/7.3' - - 'docker build --no-cache -t webdevops/php-nginx:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.3" >> Dockerfile_62ae1ba204c3f0.79900329' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204c3f0.79900329' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjMiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGMzZjAuNzk5MDAzMjkifQ== Dockerfile_62ae1ba204c3f0.79900329' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.3 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:7.3' - - 'docker tag webdevops/php-nginx:7.3 $CI_REGISTRY_IMAGE/php-nginx:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.3' - tags: - - aws - needs: - - 'webdevops/php:7.3' -'webdevops/php-nginx-dev:7.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-nginx-dev/7.3' - - 'docker build --no-cache -t webdevops/php-nginx-dev:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.3" >> Dockerfile_62ae1ba204c7c8.97339000' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204c7c8.97339000' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny4zIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRjN2M4Ljk3MzM5MDAwIn0= Dockerfile_62ae1ba204c7c8.97339000' - - 'docker push webdevops/php-nginx-dev:7.3' - - 'docker tag webdevops/php-nginx-dev:7.3 $CI_REGISTRY_IMAGE/php-nginx-dev:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.3' - tags: - - aws - needs: - - 'webdevops/php-nginx:7.3' -'webdevops/php-dev:7.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-dev/7.3' - - 'docker build --no-cache -t webdevops/php-dev:7.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.3" >> Dockerfile_62ae1ba204cb33.21634182' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204cb33.21634182' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny4zIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRjYjMzLjIxNjM0MTgyIn0= Dockerfile_62ae1ba204cb33.21634182' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.3 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:7.3' - - 'docker tag webdevops/php-dev:7.3 $CI_REGISTRY_IMAGE/php-dev:7.3' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.3' - tags: - - aws - needs: - - 'webdevops/php:7.3' 'webdevops/php:7.4': stage: level2 before_script: @@ -955,10 +809,10 @@ stages: - 'cd docker/php-official/7.4' - 'docker build --no-cache -t webdevops/php:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_62ae1ba204ceb8.53467647' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204ceb8.53467647' + - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63973bcba331f7.20659322' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba331f7.20659322' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGNlYjguNTM0Njc2NDcifQ== Dockerfile_62ae1ba204ceb8.53467647' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzMxZjcuMjA2NTkzMjIifQ== Dockerfile_63973bcba331f7.20659322' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - 'docker push webdevops/php:7.4' @@ -982,10 +836,10 @@ stages: - 'cd docker/php-apache/7.4' - 'docker build --no-cache -t webdevops/php-apache:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_62ae1ba204d221.35465026' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204d221.35465026' + - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63973bcba33421.53986741' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33421.53986741' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRkMjIxLjM1NDY1MDI2In0= Dockerfile_62ae1ba204d221.35465026' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzNDIxLjUzOTg2NzQxIn0= Dockerfile_63973bcba33421.53986741' - 'docker push webdevops/php-apache:7.4' - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' @@ -1005,10 +859,10 @@ stages: - 'cd docker/php-apache-dev/7.4' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_62ae1ba204d579.00140128' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204d579.00140128' + - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_63973bcba33631.32232296' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33631.32232296' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZDU3OS4wMDE0MDEyOCJ9 Dockerfile_62ae1ba204d579.00140128' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMzYzMS4zMjIzMjI5NiJ9 Dockerfile_63973bcba33631.32232296' - 'docker push webdevops/php-apache-dev:7.4' - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' @@ -1028,10 +882,10 @@ stages: - 'cd docker/php-nginx/7.4' - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_62ae1ba204d8c4.39313866' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204d8c4.39313866' + - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63973bcba33833.66888961' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33833.66888961' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGQ4YzQuMzkzMTM4NjYifQ== Dockerfile_62ae1ba204d8c4.39313866' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzM4MzMuNjY4ODg5NjEifQ== Dockerfile_63973bcba33833.66888961' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4' @@ -1053,10 +907,10 @@ stages: - 'cd docker/php-nginx-dev/7.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_62ae1ba204dc43.63880695' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204dc43.63880695' + - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63973bcba33ac5.59194279' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33ac5.59194279' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRkYzQzLjYzODgwNjk1In0= Dockerfile_62ae1ba204dc43.63880695' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzYWM1LjU5MTk0Mjc5In0= Dockerfile_63973bcba33ac5.59194279' - 'docker push webdevops/php-nginx-dev:7.4' - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' @@ -1094,10 +948,10 @@ stages: - 'cd docker/php-dev/7.4' - 'docker build --no-cache -t webdevops/php-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_62ae1ba204e295.59673830' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e295.59673830' + - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63973bcba33e91.90384748' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33e91.90384748' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRlMjk1LjU5NjczODMwIn0= Dockerfile_62ae1ba204e295.59673830' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzZTkxLjkwMzg0NzQ4In0= Dockerfile_63973bcba33e91.90384748' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4' @@ -1119,10 +973,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_62ae1ba204e602.52166074' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e602.52166074' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63973bcba340b3.37543648' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba340b3.37543648' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRlNjAyLjUyMTY2MDc0In0= Dockerfile_62ae1ba204e602.52166074' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM0MGIzLjM3NTQzNjQ4In0= Dockerfile_63973bcba340b3.37543648' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -1146,10 +1000,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_62ae1ba204e982.01159543' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e982.01159543' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_63973bcba342d6.11255792' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba342d6.11255792' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZTk4Mi4wMTE1OTU0MyJ9 Dockerfile_62ae1ba204e982.01159543' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNDJkNi4xMTI1NTc5MiJ9 Dockerfile_63973bcba342d6.11255792' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -1169,10 +1023,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_62ae1ba204ed79.23028654' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204ed79.23028654' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63973bcba344d4.66533556' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba344d4.66533556' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGVkNzkuMjMwMjg2NTQifQ== Dockerfile_62ae1ba204ed79.23028654' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzQ0ZDQuNjY1MzM1NTYifQ== Dockerfile_63973bcba344d4.66533556' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -1192,10 +1046,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_62ae1ba204f130.99828471' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f130.99828471' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63973bcba346c1.50230384' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba346c1.50230384' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRmMTMwLjk5ODI4NDcxIn0= Dockerfile_62ae1ba204f130.99828471' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM0NmMxLjUwMjMwMzg0In0= Dockerfile_63973bcba346c1.50230384' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -1217,10 +1071,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_62ae1ba204f560.58381463' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f560.58381463' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63973bcba348f5.03736054' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba348f5.03736054' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZjU2MC41ODM4MTQ2MyJ9 Dockerfile_62ae1ba204f560.58381463' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNDhmNS4wMzczNjA1NCJ9 Dockerfile_63973bcba348f5.03736054' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -1240,10 +1094,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_62ae1ba204f8b7.27167310' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f8b7.27167310' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63973bcba34b16.40431200' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba34b16.40431200' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZjhiNy4yNzE2NzMxMCJ9 Dockerfile_62ae1ba204f8b7.27167310' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNGIxNi40MDQzMTIwMCJ9 Dockerfile_63973bcba34b16.40431200' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -1253,152 +1107,6 @@ stages: - aws needs: - 'webdevops/php:8.2-alpine' -'webdevops/php:7.3-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-official/7.3-alpine' - - 'docker build --no-cache -t webdevops/php:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.3-alpine" >> Dockerfile_62ae1ba2051b64.72740996' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2051b64.72740996' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjMtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDUxYjY0LjcyNzQwOTk2In0= Dockerfile_62ae1ba2051b64.72740996' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.3-alpine --config php/test.yaml' - - 'docker push webdevops/php:7.3-alpine' - - 'docker tag webdevops/php:7.3-alpine $CI_REGISTRY_IMAGE/php:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:7.3-alpine' - - 'docker tag webdevops/php:7.3-alpine webdevops/php-official:7.3-alpine' - - 'docker push webdevops/php-official:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-apache:7.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-apache/7.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.3-alpine" >> Dockerfile_62ae1ba2051f67.53794972' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2051f67.53794972' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny4zLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1MWY2Ny41Mzc5NDk3MiJ9 Dockerfile_62ae1ba2051f67.53794972' - - 'docker push webdevops/php-apache:7.3-alpine' - - 'docker tag webdevops/php-apache:7.3-alpine $CI_REGISTRY_IMAGE/php-apache:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.3-alpine' -'webdevops/php-apache-dev:7.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-apache-dev/7.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.3-alpine" >> Dockerfile_62ae1ba2052355.38995776' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2052355.38995776' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuMy1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNTIzNTUuMzg5OTU3NzYifQ== Dockerfile_62ae1ba2052355.38995776' - - 'docker push webdevops/php-apache-dev:7.3-alpine' - - 'docker tag webdevops/php-apache-dev:7.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:7.3-alpine' -'webdevops/php-nginx:7.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-nginx/7.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.3-alpine" >> Dockerfile_62ae1ba2052bb7.78707675' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2052bb7.78707675' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjMtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDUyYmI3Ljc4NzA3Njc1In0= Dockerfile_62ae1ba2052bb7.78707675' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.3-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:7.3-alpine' - - 'docker tag webdevops/php-nginx:7.3-alpine $CI_REGISTRY_IMAGE/php-nginx:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.3-alpine' -'webdevops/php-nginx-dev:7.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-nginx-dev/7.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.3-alpine" >> Dockerfile_62ae1ba2053460.68888404' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2053460.68888404' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny4zLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1MzQ2MC42ODg4ODQwNCJ9 Dockerfile_62ae1ba2053460.68888404' - - 'docker push webdevops/php-nginx-dev:7.3-alpine' - - 'docker tag webdevops/php-nginx-dev:7.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:7.3-alpine' -'webdevops/php-dev:7.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-dev/7.3-alpine' - - 'docker build --no-cache -t webdevops/php-dev:7.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.3-alpine" >> Dockerfile_62ae1ba2053a65.56822038' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2053a65.56822038' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny4zLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1M2E2NS41NjgyMjAzOCJ9 Dockerfile_62ae1ba2053a65.56822038' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.3-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:7.3-alpine' - - 'docker tag webdevops/php-dev:7.3-alpine $CI_REGISTRY_IMAGE/php-dev:7.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.3-alpine' 'webdevops/php:8.1-alpine': stage: level2 before_script: @@ -1411,10 +1119,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_62ae1ba2056be9.98212910' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2056be9.98212910' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_63973bcba37302.69475502' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37302.69475502' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU2YmU5Ljk4MjEyOTEwIn0= Dockerfile_62ae1ba2056be9.98212910' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM3MzAyLjY5NDc1NTAyIn0= Dockerfile_63973bcba37302.69475502' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -1438,10 +1146,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_62ae1ba2057639.53737843' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057639.53737843' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_63973bcba37524.35016678' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37524.35016678' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1NzYzOS41MzczNzg0MyJ9 Dockerfile_62ae1ba2057639.53737843' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNzUyNC4zNTAxNjY3OCJ9 Dockerfile_63973bcba37524.35016678' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -1461,10 +1169,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_62ae1ba2057ac2.33432049' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057ac2.33432049' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_63973bcba37710.04963924' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37710.04963924' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNTdhYzIuMzM0MzIwNDkifQ== Dockerfile_62ae1ba2057ac2.33432049' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzc3MTAuMDQ5NjM5MjQifQ== Dockerfile_63973bcba37710.04963924' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -1484,10 +1192,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_62ae1ba2057e26.35380534' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057e26.35380534' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_63973bcba37904.82762017' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37904.82762017' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU3ZTI2LjM1MzgwNTM0In0= Dockerfile_62ae1ba2057e26.35380534' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM3OTA0LjgyNzYyMDE3In0= Dockerfile_63973bcba37904.82762017' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -1509,10 +1217,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_62ae1ba2058542.23710867' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2058542.23710867' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_63973bcba37b72.01623258' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37b72.01623258' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ODU0Mi4yMzcxMDg2NyJ9 Dockerfile_62ae1ba2058542.23710867' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzN2I3Mi4wMTYyMzI1OCJ9 Dockerfile_63973bcba37b72.01623258' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -1532,10 +1240,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_62ae1ba2058cd7.85159463' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2058cd7.85159463' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_63973bcba37d72.28156520' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37d72.28156520' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1OGNkNy44NTE1OTQ2MyJ9 Dockerfile_62ae1ba2058cd7.85159463' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzN2Q3Mi4yODE1NjUyMCJ9 Dockerfile_63973bcba37d72.28156520' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -1557,10 +1265,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_62ae1ba20593b8.74182068' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20593b8.74182068' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_63973bcba37f98.75818116' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37f98.75818116' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNTkzYjguNzQxODIwNjgifQ== Dockerfile_62ae1ba20593b8.74182068' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzdmOTguNzU4MTgxMTYifQ== Dockerfile_63973bcba37f98.75818116' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -1584,10 +1292,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_62ae1ba2059ce9.25662698' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2059ce9.25662698' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_63973bcba381a2.72294704' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba381a2.72294704' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU5Y2U5LjI1NjYyNjk4In0= Dockerfile_62ae1ba2059ce9.25662698' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4MWEyLjcyMjk0NzA0In0= Dockerfile_63973bcba381a2.72294704' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -1607,10 +1315,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_62ae1ba205a225.24207095' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205a225.24207095' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_63973bcba383e6.18449306' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba383e6.18449306' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1YTIyNS4yNDIwNzA5NSJ9 Dockerfile_62ae1ba205a225.24207095' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzODNlNi4xODQ0OTMwNiJ9 Dockerfile_63973bcba383e6.18449306' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -1630,10 +1338,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_62ae1ba205a632.50407419' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205a632.50407419' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_63973bcba385d3.59543311' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba385d3.59543311' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNWE2MzIuNTA0MDc0MTkifQ== Dockerfile_62ae1ba205a632.50407419' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzg1ZDMuNTk1NDMzMTEifQ== Dockerfile_63973bcba385d3.59543311' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -1655,10 +1363,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_62ae1ba205aad8.38274675' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205aad8.38274675' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_63973bcba387f4.54918460' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba387f4.54918460' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVhYWQ4LjM4Mjc0Njc1In0= Dockerfile_62ae1ba205aad8.38274675' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4N2Y0LjU0OTE4NDYwIn0= Dockerfile_63973bcba387f4.54918460' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -1678,10 +1386,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_62ae1ba205ae71.70890686' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205ae71.70890686' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_63973bcba389f9.06165459' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba389f9.06165459' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVhZTcxLjcwODkwNjg2In0= Dockerfile_62ae1ba205ae71.70890686' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4OWY5LjA2MTY1NDU5In0= Dockerfile_63973bcba389f9.06165459' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -1703,10 +1411,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_62ae1ba205caf7.09509524' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205caf7.09509524' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_63973bcba398a9.65089242' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba398a9.65089242' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVjYWY3LjA5NTA5NTI0In0= Dockerfile_62ae1ba205caf7.09509524' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM5OGE5LjY1MDg5MjQyIn0= Dockerfile_63973bcba398a9.65089242' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1730,10 +1438,10 @@ stages: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_62ae1ba205cf06.91614232' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205cf06.91614232' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_63973bcba39ab5.90643987' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39ab5.90643987' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1Y2YwNi45MTYxNDIzMiJ9 Dockerfile_62ae1ba205cf06.91614232' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzOWFiNS45MDY0Mzk4NyJ9 Dockerfile_63973bcba39ab5.90643987' - 'docker push webdevops/php-apache:8.0-alpine' - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' @@ -1753,10 +1461,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_62ae1ba205d370.84691063' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205d370.84691063' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_63973bcba39ca5.87075067' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39ca5.87075067' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNWQzNzAuODQ2OTEwNjMifQ== Dockerfile_62ae1ba205d370.84691063' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzljYTUuODcwNzUwNjcifQ== Dockerfile_63973bcba39ca5.87075067' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1776,10 +1484,10 @@ stages: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_62ae1ba205d760.24588028' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205d760.24588028' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_63973bcba39e92.32025016' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39e92.32025016' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVkNzYwLjI0NTg4MDI4In0= Dockerfile_62ae1ba205d760.24588028' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM5ZTkyLjMyMDI1MDE2In0= Dockerfile_63973bcba39e92.32025016' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0-alpine' @@ -1801,10 +1509,10 @@ stages: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_62ae1ba205dbb0.94021838' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205dbb0.94021838' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_63973bcba3a0b5.32524529' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3a0b5.32524529' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ZGJiMC45NDAyMTgzOCJ9 Dockerfile_62ae1ba205dbb0.94021838' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYTBiNS4zMjUyNDUyOSJ9 Dockerfile_63973bcba3a0b5.32524529' - 'docker push webdevops/php-nginx-dev:8.0-alpine' - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' @@ -1824,10 +1532,10 @@ stages: - 'cd docker/php-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_62ae1ba205dfc7.92190217' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205dfc7.92190217' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_63973bcba3a2b1.33298496' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3a2b1.33298496' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ZGZjNy45MjE5MDIxNyJ9 Dockerfile_62ae1ba205dfc7.92190217' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYTJiMS4zMzI5ODQ5NiJ9 Dockerfile_63973bcba3a2b1.33298496' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0-alpine' @@ -1849,10 +1557,10 @@ stages: - 'cd docker/php-official/8.0' - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_62ae1ba20602d4.40769785' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20602d4.40769785' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_63973bcba3b180.89402407' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b180.89402407' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNjAyZDQuNDA3Njk3ODUifQ== Dockerfile_62ae1ba20602d4.40769785' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhM2IxODAuODk0MDI0MDcifQ== Dockerfile_63973bcba3b180.89402407' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - 'docker push webdevops/php:8.0' @@ -1876,10 +1584,10 @@ stages: - 'cd docker/php-apache/8.0' - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_62ae1ba20606f5.17114685' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20606f5.17114685' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_63973bcba3b397.08610675' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b397.08610675' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYwNmY1LjE3MTE0Njg1In0= Dockerfile_62ae1ba20606f5.17114685' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiMzk3LjA4NjEwNjc1In0= Dockerfile_63973bcba3b397.08610675' - 'docker push webdevops/php-apache:8.0' - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' @@ -1899,10 +1607,10 @@ stages: - 'cd docker/php-apache-dev/8.0' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_62ae1ba2060b17.77215705' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2060b17.77215705' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_63973bcba3b599.41475809' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b599.41475809' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA2MGIxNy43NzIxNTcwNSJ9 Dockerfile_62ae1ba2060b17.77215705' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYjU5OS40MTQ3NTgwOSJ9 Dockerfile_63973bcba3b599.41475809' - 'docker push webdevops/php-apache-dev:8.0' - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' @@ -1922,10 +1630,10 @@ stages: - 'cd docker/php-nginx/8.0' - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_62ae1ba2060f01.47419866' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2060f01.47419866' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_63973bcba3b795.38715815' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b795.38715815' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNjBmMDEuNDc0MTk4NjYifQ== Dockerfile_62ae1ba2060f01.47419866' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhM2I3OTUuMzg3MTU4MTUifQ== Dockerfile_63973bcba3b795.38715815' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0' @@ -1947,10 +1655,10 @@ stages: - 'cd docker/php-nginx-dev/8.0' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_62ae1ba2061324.18974411' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2061324.18974411' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_63973bcba3b9a2.06874993' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b9a2.06874993' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYxMzI0LjE4OTc0NDExIn0= Dockerfile_62ae1ba2061324.18974411' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiOWEyLjA2ODc0OTkzIn0= Dockerfile_63973bcba3b9a2.06874993' - 'docker push webdevops/php-nginx-dev:8.0' - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' @@ -1970,10 +1678,10 @@ stages: - 'cd docker/php-dev/8.0' - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_62ae1ba20617a2.42823094' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20617a2.42823094' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_63973bcba3bbb0.25794729' + - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3bbb0.25794729' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYxN2EyLjQyODIzMDk0In0= Dockerfile_62ae1ba20617a2.42823094' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiYmIwLjI1Nzk0NzI5In0= Dockerfile_63973bcba3bbb0.25794729' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0' diff --git a/ci/BLACKLIST b/ci/BLACKLIST index 805309d2f..b5fd05256 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -9,4 +9,5 @@ liqui 5.6 7.0 7.1 -7.2 \ No newline at end of file +7.2 +7.3 \ No newline at end of file diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 3a4dc9c9f..3c4792d88 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.2-rc-fpm-alpine +FROM php:8.2-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.2-alpine/Dockerfile.jinja2 b/docker/php-official/8.2-alpine/Dockerfile.jinja2 index 101c138a7..1c2ea95d4 100644 --- a/docker/php-official/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.2-rc-fpm-alpine") }} +{{ docker.fromOfficial("php", "8.2-fpm-alpine") }} {{ docker.version() }} diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 208ffed08..55c57dd9d 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.2-rc-fpm-buster +FROM php:8.2-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.2/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 4c5817e5c..4d2290454 100644 --- a/docker/php-official/8.2/Dockerfile.jinja2 +++ b/docker/php-official/8.2/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.2-rc-fpm-buster") }} +{{ docker.fromOfficial("php", "8.2-fpm-buster") }} {{ docker.version() }} @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.1') }} \ + {{ php.official(version='8.2') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} From 3ffed4a1bc036b3c815809d08a33f1d3549c0217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 12 Dec 2022 16:11:07 +0100 Subject: [PATCH 03/63] fix: structure tests 8.2-nginx --- README.md | 88 ++++++++----------- .../dockerfiles/include/image-tag-php.rst | 25 +++--- tests/structure-test/php-nginx/test.yaml | 2 +- 3 files changed, 54 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 5654caad5..761589ddf 100644 --- a/README.md +++ b/README.md @@ -39,45 +39,35 @@ The following images are DEPRECATED and not longer built automatically: * `webdevops/php-nginx-dev:ubuntu-*` * `webdevops/php-nginx-dev:debian-*` -You shall use the new images which are based on the official `php:7.(1|2|3|4)-fpm` images. +Also only supported PHP versions are built automatically. + +You shall use the new images which are based on the official `php:(7|8).(0|1|2|3|4)-fpm` images. The official PHP images are based on debian. -* `webdevops/php:5.6` -* `webdevops/php:7.0` -* `webdevops/php:7.1` -* `webdevops/php:7.2` -* `webdevops/php:7.3` * `webdevops/php:7.4` -* `webdevops/php-dev:5.6` -* `webdevops/php-dev:7.0` -* `webdevops/php-dev:7.1` -* `webdevops/php-dev:7.2` -* `webdevops/php-dev:7.3` +* `webdevops/php:8.0` +* `webdevops/php:8.1` +* `webdevops/php:8.2` * `webdevops/php-dev:7.4` -* `webdevops/php-apache:5.6` -* `webdevops/php-apache:7.0` -* `webdevops/php-apache:7.1` -* `webdevops/php-apache:7.2` -* `webdevops/php-apache:7.3` +* `webdevops/php-dev:8.0` +* `webdevops/php-dev:8.1` +* `webdevops/php-dev:8.2` * `webdevops/php-apache:7.4` -* `webdevops/php-apache-dev:5.6` -* `webdevops/php-apache-dev:7.0` -* `webdevops/php-apache-dev:7.1` -* `webdevops/php-apache-dev:7.2` -* `webdevops/php-apache-dev:7.3` +* `webdevops/php-apache:8.0` +* `webdevops/php-apache:8.1` +* `webdevops/php-apache:8.2` * `webdevops/php-apache-dev:7.4` -* `webdevops/php-nginx:5.6` -* `webdevops/php-nginx:7.0` -* `webdevops/php-nginx:7.1` -* `webdevops/php-nginx:7.2` -* `webdevops/php-nginx:7.3` +* `webdevops/php-apache-dev:8.0` +* `webdevops/php-apache-dev:8.1` +* `webdevops/php-apache-dev:8.2` * `webdevops/php-nginx:7.4` -* `webdevops/php-nginx-dev:5.6` -* `webdevops/php-nginx-dev:7.0` -* `webdevops/php-nginx-dev:7.1` -* `webdevops/php-nginx-dev:7.2` -* `webdevops/php-nginx-dev:7.3` +* `webdevops/php-nginx:8.0` +* `webdevops/php-nginx:8.1` +* `webdevops/php-nginx:8.2` * `webdevops/php-nginx-dev:7.4` +* `webdevops/php-nginx-dev:8.0` +* `webdevops/php-nginx-dev:8.1` +* `webdevops/php-nginx-dev:8.2` ### Alpine PHP @@ -105,29 +95,29 @@ The following images are DEPRECATED and not longer built automatically: You shall use the new images which are based on the official `php:7.(1|2|3|4)-fpm-alpine` images. -* `webdevops/php:7.1-alpine` -* `webdevops/php:7.2-alpine` -* `webdevops/php:7.3-alpine` * `webdevops/php:7.4-alpine` -* `webdevops/php-dev:7.1-alpine` -* `webdevops/php-dev:7.2-alpine` -* `webdevops/php-dev:7.3-alpine` +* `webdevops/php:8.0-alpine` +* `webdevops/php:8.1-alpine` +* `webdevops/php:8.2-alpine` * `webdevops/php-dev:7.4-alpine` -* `webdevops/php-apache:7.1-alpine` -* `webdevops/php-apache:7.2-alpine` -* `webdevops/php-apache:7.3-alpine` +* `webdevops/php-dev:8.0-alpine` +* `webdevops/php-dev:8.1-alpine` +* `webdevops/php-dev:8.2-alpine` * `webdevops/php-apache:7.4-alpine` -* `webdevops/php-apache-dev:7.1-alpine` -* `webdevops/php-apache-dev:7.2-alpine` -* `webdevops/php-apache-dev:7.3-alpine` +* `webdevops/php-apache:8.0-alpine` +* `webdevops/php-apache:8.1-alpine` +* `webdevops/php-apache:8.2-alpine` * `webdevops/php-apache-dev:7.4-alpine` -* `webdevops/php-nginx:7.1-alpine` -* `webdevops/php-nginx:7.2-alpine` -* `webdevops/php-nginx:7.3-alpine` +* `webdevops/php-apache-dev:8.0-alpine` +* `webdevops/php-apache-dev:8.1-alpine` +* `webdevops/php-apache-dev:8.2-alpine` * `webdevops/php-nginx:7.4-alpine` -* `webdevops/php-nginx-dev:7.1-alpine` -* `webdevops/php-nginx-dev:7.2-alpine` -* `webdevops/php-nginx-dev:7.3-alpine` +* `webdevops/php-nginx:8.0-alpine` +* `webdevops/php-nginx:8.1-alpine` +* `webdevops/php-nginx:8.2-alpine` * `webdevops/php-nginx-dev:7.4-alpine` +* `webdevops/php-nginx-dev:8.0-alpine` +* `webdevops/php-nginx-dev:8.1-alpine` +* `webdevops/php-nginx-dev:8.2-alpine` *We left out 7.0 because it would vary too much from the current versions* diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index 0f8123394..623549d92 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -1,19 +1,22 @@ ====================== =================================== =============== Tag Distribution name PHP Version ====================== =================================== =============== -``5.6`` *customized official php image* PHP 5.6 -``7.0`` *customized official php image* PHP 7.0 -``7.1`` *customized official php image* PHP 7.1 -``7.2`` *customized official php image* PHP 7.2 -``7.3`` *customized official php image* PHP 7.3 +``5.6`` *deprecated* PHP 5.6 +``7.0`` *deprecated* PHP 7.0 +``7.1`` *deprecated* PHP 7.1 +``7.2`` *deprecated* PHP 7.2 +``7.3`` *deprecated* PHP 7.3 ``7.4`` *customized official php image* PHP 7.4 ``8.0`` *customized official php image* PHP 8.0 ``8.1`` *customized official php image* PHP 8.1 -``7.1-alpine`` *customized official php image* PHP 7.1 -``7.2-alpine`` *customized official php image* PHP 7.2 -``7.3-alpine`` *customized official php image* PHP 7.3 +``8.2`` *customized official php image* PHP 8.2 +``7.1-alpine`` *deprecated* PHP 7.1 +``7.2-alpine`` *deprecated* PHP 7.2 +``7.3-alpine`` *deprecated* PHP 7.3 ``7.4-alpine`` *customized official php image* PHP 7.4 ``8.0-alpine`` *customized official php image* PHP 8.0 +``8.1-alpine`` *customized official php image* PHP 8.1 +``8.2-alpine`` *customized official php image* PHP 8.2 ``alpine`` *deprecated* PHP 7.x ``alpine-php7`` *deprecated* PHP 7.x ``alpine-php5`` *deprecated* PHP 5.6 @@ -28,7 +31,7 @@ Tag Distribution name PHP Version ``debian-8`` *deprecated* PHP 5.6 ``debian-8-php7`` *deprecated* PHP 7.x (via sury) ``debian-9`` *deprecated* PHP 7.0 -``centos-7`` PHP 5.4 -``centos-7-php56`` PHP 5.6 -``centos-7-php7`` PHP 7.0 +``centos-7`` *deprecated* PHP 5.4 +``centos-7-php56`` *deprecated* PHP 5.6 +``centos-7-php7`` *deprecated* PHP 7.0 ====================== =================================== =============== diff --git a/tests/structure-test/php-nginx/test.yaml b/tests/structure-test/php-nginx/test.yaml index 7ca31f1f9..4b298e79b 100644 --- a/tests/structure-test/php-nginx/test.yaml +++ b/tests/structure-test/php-nginx/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "WEB_DOCUMENT_ROOT" value: "/app" - key: "WEB_DOCUMENT_INDEX" From 7b18342e2c17171c1e0ca24f70624091f8cf8e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 12 Dec 2022 16:17:11 +0100 Subject: [PATCH 04/63] fix: xdebug version, alpine dependencies --- docker/php-apache-dev/7.4-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.4/Dockerfile | 2 +- docker/php-dev/7.4-alpine/Dockerfile | 2 +- docker/php-dev/7.4/Dockerfile | 2 +- docker/php-nginx-dev/7.4-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.4/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 2 ++ docker/php-official/7.2-alpine/Dockerfile | 2 ++ docker/php-official/7.3-alpine/Dockerfile | 2 ++ docker/php-official/7.4-alpine/Dockerfile | 2 ++ docker/php-official/8.0-alpine/Dockerfile | 2 ++ docker/php-official/8.1-alpine/Dockerfile | 2 ++ docker/php-official/8.2-alpine/Dockerfile | 2 ++ template/Dockerfile/images/php.jinja2 | 6 ++++++ 14 files changed, 26 insertions(+), 6 deletions(-) diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index 47833d129..1ededffbe 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -23,7 +23,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ g++ \ diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 57a0ebda2..b30d783d8 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -22,7 +22,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 33dd4f39b..73456cd76 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -15,7 +15,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ g++ \ diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 6293b0ab4..c104dbbfe 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 34dfb843c..9c00dc76d 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -23,7 +23,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ g++ \ diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 802cf0af8..f20cf4e3d 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -22,7 +22,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && pecl install xdebug-3.1.6 \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index e63d2bab0..9a7db725b 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -195,6 +196,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index f49243351..5d3f863ee 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -199,6 +200,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index e6c9b320a..190b9c0b4 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -199,6 +200,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 003b52fce..f915a1208 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -202,6 +203,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index e7f8519b2..97d7e7116 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -202,6 +203,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 89879b3fa..42341d11f 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -201,6 +202,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 3c4792d88..113fcca8d 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -105,6 +105,7 @@ RUN set -x \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -201,6 +202,7 @@ RUN set -x \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index c933adf4c..82ba5f41c 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -206,6 +206,7 @@ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -343,6 +344,7 @@ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ libtool \ @@ -387,6 +389,8 @@ && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ + {%- elif version == '7.4' %} + && pecl install xdebug-3.1.6 \ {%- else %} && pecl install xdebug \ {%- endif %} @@ -406,6 +410,8 @@ && pecl install xdebug-2.5.5 \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ + {%- elif version == '7.4' %} + && pecl install xdebug-3.1.6 \ {%- else %} && pecl install xdebug \ {%- endif %} From 3549ea056a745f14e6552843b07300371bedddf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 12 Dec 2022 16:44:55 +0100 Subject: [PATCH 05/63] fix: structure test --- tests/structure-test/base-app/test.yaml | 2 +- tests/structure-test/base/test.yaml | 2 +- tests/structure-test/bootstrap/alpine/test.yaml | 2 +- tests/structure-test/bootstrap/centos-7/test.yaml | 2 +- tests/structure-test/bootstrap/debian-8/test.yaml | 2 +- tests/structure-test/bootstrap/debian-9/test.yaml | 2 +- tests/structure-test/bootstrap/test.yaml | 2 +- tests/structure-test/bootstrap/ubuntu-16.04/test.yaml | 2 +- tests/structure-test/bootstrap/ubuntu-16.10/test.yaml | 2 +- tests/structure-test/bootstrap/ubuntu-17.04/test.yaml | 2 +- tests/structure-test/bootstrap/ubuntu-17.10/test.yaml | 2 +- tests/structure-test/bootstrap/ubuntu-18.04/test.yaml | 2 +- tests/structure-test/php/7.2/test.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/structure-test/base-app/test.yaml b/tests/structure-test/base-app/test.yaml index fad80dae7..0df9e614b 100644 --- a/tests/structure-test/base-app/test.yaml +++ b/tests/structure-test/base-app/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "APPLICATION_USER" value: "application" - key: "APPLICATION_GROUP" diff --git a/tests/structure-test/base/test.yaml b/tests/structure-test/base/test.yaml index a8bb50945..ebb45f4b5 100644 --- a/tests/structure-test/base/test.yaml +++ b/tests/structure-test/base/test.yaml @@ -3,7 +3,7 @@ schemaVersion: "2.0.0" metadataTest: entrypoint: ["/entrypoint"] cmd: ["supervisord"] - env: + envVars: - key: "DOCKER_CONF_HOME" value: "/opt/docker/" - key: "LOG_STDOUT" diff --git a/tests/structure-test/bootstrap/alpine/test.yaml b/tests/structure-test/bootstrap/alpine/test.yaml index 92956eb26..6df7622be 100644 --- a/tests/structure-test/bootstrap/alpine/test.yaml +++ b/tests/structure-test/bootstrap/alpine/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/centos-7/test.yaml b/tests/structure-test/bootstrap/centos-7/test.yaml index 7266d2b55..07601bfe4 100644 --- a/tests/structure-test/bootstrap/centos-7/test.yaml +++ b/tests/structure-test/bootstrap/centos-7/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/debian-8/test.yaml b/tests/structure-test/bootstrap/debian-8/test.yaml index 0eda67a73..85757c1e0 100644 --- a/tests/structure-test/bootstrap/debian-8/test.yaml +++ b/tests/structure-test/bootstrap/debian-8/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/debian-9/test.yaml b/tests/structure-test/bootstrap/debian-9/test.yaml index f9ea99db0..f68e57e79 100644 --- a/tests/structure-test/bootstrap/debian-9/test.yaml +++ b/tests/structure-test/bootstrap/debian-9/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/test.yaml b/tests/structure-test/bootstrap/test.yaml index 54c52b136..c3e8447ac 100644 --- a/tests/structure-test/bootstrap/test.yaml +++ b/tests/structure-test/bootstrap/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "LC_ALL" value: "C.UTF-8" - key: "LANG" diff --git a/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml index e1090f131..68066082f 100644 --- a/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml +++ b/tests/structure-test/bootstrap/ubuntu-16.04/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml b/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml index 59b7618f6..34ea8daf6 100644 --- a/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml +++ b/tests/structure-test/bootstrap/ubuntu-16.10/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml index 99e36bd48..916f2fcaa 100644 --- a/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml +++ b/tests/structure-test/bootstrap/ubuntu-17.04/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml b/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml index b430a5b1c..2c0052d50 100644 --- a/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml +++ b/tests/structure-test/bootstrap/ubuntu-17.10/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml b/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml index 4e10ea4a2..08db7ab31 100644 --- a/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml +++ b/tests/structure-test/bootstrap/ubuntu-18.04/test.yaml @@ -1,7 +1,7 @@ schemaVersion: "2.0.0" metadataTest: - env: + envVars: - key: "PATH" value: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/tests/structure-test/php/7.2/test.yaml b/tests/structure-test/php/7.2/test.yaml index 79693293c..46cd5a84c 100644 --- a/tests/structure-test/php/7.2/test.yaml +++ b/tests/structure-test/php/7.2/test.yaml @@ -4,7 +4,7 @@ metadataTest: # base entrypoint: ["/entrypoint"] cmd: ["supervisord"] - env: + envVars: # bootstrap - key: "LC_ALL" value: "C.UTF-8" From 1ca511a5d3249af98c375c976243629462b6b460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 12 Dec 2022 16:48:19 +0100 Subject: [PATCH 06/63] fix: alpine xdebug --- docker/php-apache-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-apache-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-apache-dev/8.1-alpine/Dockerfile | 2 ++ docker/php-apache-dev/8.2-alpine/Dockerfile | 2 ++ docker/php-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-dev/8.1-alpine/Dockerfile | 2 ++ docker/php-dev/8.2-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/8.1-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/8.2-alpine/Dockerfile | 2 ++ template/Dockerfile/images/php.jinja2 | 2 ++ 22 files changed, 44 insertions(+) diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index a6c0ab3f3..61af6c5a2 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-2.8.1 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index 3aab3d76e..549a651b4 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 2d2045354..342570707 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index 1ededffbe..5fa32afe4 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index c67d4479a..90be8e5c5 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8784b61e7..8ca77ae5f 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index aa6e765a1..681aebd27 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index d56dda9e2..b4f890907 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-2.8.1 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index a2586ad85..bf657a0ec 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 0164825ac..18c274d7f 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 73456cd76..5ace59447 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 1d8cf4f16..cfe8225b3 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index bec9c6118..cd437432c 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 61fe7e220..4d403da03 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -12,12 +12,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index c437e9283..7bd194c90 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-2.8.1 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index bbbee499c..8c95f8456 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 1fd7fd7b8..8cc518281 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 9c00dc76d..34dcb6570 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug-3.1.6 \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 2a2f8ec32..fc7544cc6 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 3e96d5a73..0c04ace98 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index 7c130a99f..a52a227a7 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -20,12 +20,14 @@ RUN set -x \ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ && pecl install xdebug \ && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 82ba5f41c..339bb56cd 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -403,6 +403,7 @@ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ make \ autoconf \ g++ \ @@ -417,6 +418,7 @@ {%- endif %} && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ From b8227e9c97126c67b5d35fe910b4155c92327c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 13 Dec 2022 11:23:17 +0100 Subject: [PATCH 07/63] cleanup deprecations and legacy --- .gitlab-ci.yml | 743 ++-- CHANGELOG.md | 250 -- LICENSE | 2 +- Makefile | 3 - README.md | 94 +- .../DockerTestServerspecTaskLoader.py | 1 - ci/BLACKLIST | 8 - ci/build-ci.php | 187 - ci/composer.json | 8 +- ci/composer.lock | 454 +- ci/src/FileReader.php | 2 - ci/src/JobBuilder.php | 4 - conf/console.yml | 90 +- conf/diagram.yml | 59 +- conf/provision.yml | 41 - docker/ansible/README.md | 19 - docker/ansible/alpine/Dockerfile | 31 - docker/ansible/alpine/Dockerfile.jinja2 | 6 - docker/ansible/centos-7/Dockerfile | 31 - docker/ansible/centos-7/Dockerfile.jinja2 | 6 - docker/ansible/debian-7/Dockerfile | 33 - docker/ansible/debian-7/Dockerfile.jinja2 | 6 - docker/ansible/debian-8/Dockerfile | 33 - docker/ansible/debian-8/Dockerfile.jinja2 | 6 - docker/ansible/debian-9/Dockerfile | 33 - docker/ansible/debian-9/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-12.04/Dockerfile | 32 - docker/ansible/ubuntu-12.04/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-14.04/Dockerfile | 32 - docker/ansible/ubuntu-14.04/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-15.04/Dockerfile | 32 - docker/ansible/ubuntu-15.04/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-15.10/Dockerfile | 32 - docker/ansible/ubuntu-15.10/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-16.04/Dockerfile | 32 - docker/ansible/ubuntu-16.04/Dockerfile.jinja2 | 6 - docker/ansible/ubuntu-17.04/Dockerfile | 32 - docker/ansible/ubuntu-17.04/Dockerfile.jinja2 | 6 - docker/apache-dev/README.md | 50 - docker/apache-dev/alpine/Dockerfile | 17 - docker/apache-dev/alpine/Dockerfile.jinja2 | 12 - .../alpine/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/centos-7/Dockerfile | 17 - docker/apache-dev/centos-7/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/debian-10/Dockerfile | 17 - docker/apache-dev/debian-10/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/debian-7/Dockerfile | 17 - docker/apache-dev/debian-7/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/debian-8/Dockerfile | 17 - docker/apache-dev/debian-8/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/debian-9/Dockerfile | 17 - docker/apache-dev/debian-9/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-12.04/Dockerfile | 17 - .../apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-14.04/Dockerfile | 17 - .../apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-15.04/Dockerfile | 17 - .../apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-15.10/Dockerfile | 17 - .../apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-16.04/Dockerfile | 17 - .../apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-16.10/Dockerfile | 17 - .../apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-17.04/Dockerfile | 17 - .../apache-dev/ubuntu-17.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-17.10/Dockerfile | 17 - .../apache-dev/ubuntu-17.10/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache-dev/ubuntu-18.04/Dockerfile | 17 - .../apache-dev/ubuntu-18.04/Dockerfile.jinja2 | 12 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/apache/centos-7/Dockerfile | 28 - docker/apache/centos-7/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../centos-7/conf/bin/service.d/httpd.sh | 13 - .../centos-7/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../centos-7/conf/etc/httpd/global.conf | 1 - .../apache/centos-7/conf/etc/httpd/main.conf | 10 - .../apache/centos-7/conf/etc/httpd/php.conf | 1 - .../centos-7/conf/etc/httpd/ssl/server.crt | 28 - .../centos-7/conf/etc/httpd/ssl/server.csr | 26 - .../centos-7/conf/etc/httpd/ssl/server.key | 51 - .../centos-7/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../apache/centos-7/conf/etc/httpd/vhost.conf | 36 - .../centos-7/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/debian-10/Dockerfile | 29 - docker/apache/debian-10/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-10/conf/bin/service.d/httpd.sh | 14 - .../debian-10/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-10/conf/etc/httpd/global.conf | 1 - .../apache/debian-10/conf/etc/httpd/main.conf | 10 - .../apache/debian-10/conf/etc/httpd/php.conf | 1 - .../debian-10/conf/etc/httpd/ssl/server.crt | 28 - .../debian-10/conf/etc/httpd/ssl/server.csr | 26 - .../debian-10/conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-10/conf/etc/httpd/vhost.conf | 36 - .../debian-10/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/debian-7/Dockerfile | 33 - docker/apache/debian-7/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-7/conf/bin/service.d/httpd.sh | 14 - .../debian-7/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-7/conf/etc/httpd/global.conf | 1 - .../apache/debian-7/conf/etc/httpd/main.conf | 10 - .../apache/debian-7/conf/etc/httpd/php.conf | 1 - .../debian-7/conf/etc/httpd/ssl/server.crt | 28 - .../debian-7/conf/etc/httpd/ssl/server.csr | 26 - .../debian-7/conf/etc/httpd/ssl/server.key | 51 - .../debian-7/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../apache/debian-7/conf/etc/httpd/vhost.conf | 36 - .../debian-7/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/debian-8/Dockerfile | 32 - docker/apache/debian-8/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-8/conf/bin/service.d/httpd.sh | 14 - .../debian-8/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-8/conf/etc/httpd/global.conf | 1 - .../apache/debian-8/conf/etc/httpd/main.conf | 10 - .../apache/debian-8/conf/etc/httpd/php.conf | 1 - .../debian-8/conf/etc/httpd/ssl/server.crt | 28 - .../debian-8/conf/etc/httpd/ssl/server.csr | 26 - .../debian-8/conf/etc/httpd/ssl/server.key | 51 - .../debian-8/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../apache/debian-8/conf/etc/httpd/vhost.conf | 36 - .../debian-8/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/debian-9/Dockerfile | 29 - docker/apache/debian-9/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-9/conf/bin/service.d/httpd.sh | 14 - .../debian-9/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-9/conf/etc/httpd/global.conf | 1 - .../apache/debian-9/conf/etc/httpd/main.conf | 10 - .../apache/debian-9/conf/etc/httpd/php.conf | 1 - .../debian-9/conf/etc/httpd/ssl/server.crt | 28 - .../debian-9/conf/etc/httpd/ssl/server.csr | 26 - .../debian-9/conf/etc/httpd/ssl/server.key | 51 - .../debian-9/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../apache/debian-9/conf/etc/httpd/vhost.conf | 36 - .../debian-9/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-12.04/Dockerfile | 32 - docker/apache/ubuntu-12.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-12.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-12.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-12.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-12.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-12.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-14.04/Dockerfile | 32 - docker/apache/ubuntu-14.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-14.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-14.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-14.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-14.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-14.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-15.04/Dockerfile | 30 - docker/apache/ubuntu-15.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-15.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-15.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-15.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-15.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-15.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-15.10/Dockerfile | 30 - docker/apache/ubuntu-15.10/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-15.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-15.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-15.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-15.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-15.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-16.04/Dockerfile | 30 - docker/apache/ubuntu-16.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-16.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-16.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-16.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-16.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-16.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-16.10/Dockerfile | 30 - docker/apache/ubuntu-16.10/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-16.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-16.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-16.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-16.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-16.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-17.04/Dockerfile | 30 - docker/apache/ubuntu-17.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-17.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-17.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-17.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-17.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-17.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-17.10/Dockerfile | 30 - docker/apache/ubuntu-17.10/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-17.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-17.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-17.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-17.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-17.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/apache/ubuntu-18.04/Dockerfile | 30 - docker/apache/ubuntu-18.04/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-18.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-18.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-18.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-18.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-18.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/base-app/centos-7/Dockerfile | 31 - docker/base-app/centos-7/Dockerfile.jinja2 | 10 - docker/base-app/debian-10/Dockerfile | 31 - docker/base-app/debian-10/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/debian-7/Dockerfile | 31 - docker/base-app/debian-7/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/debian-8/Dockerfile | 31 - docker/base-app/debian-8/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/debian-9/Dockerfile | 31 - docker/base-app/debian-9/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-14.04/Dockerfile | 32 - .../base-app/ubuntu-14.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-15.04/Dockerfile | 32 - .../base-app/ubuntu-15.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-15.10/Dockerfile | 32 - .../base-app/ubuntu-15.10/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-16.04/Dockerfile | 32 - .../base-app/ubuntu-16.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-16.10/Dockerfile | 32 - .../base-app/ubuntu-16.10/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-17.04/Dockerfile | 32 - .../base-app/ubuntu-17.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-17.10/Dockerfile | 32 - .../base-app/ubuntu-17.10/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-18.04/Dockerfile | 32 - .../base-app/ubuntu-18.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - docker/base-app/ubuntu-20.04/Dockerfile | 32 - .../base-app/ubuntu-20.04/Dockerfile.jinja2 | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../{ubuntu-12.04 => ubuntu-22.04}/Dockerfile | 4 +- .../Dockerfile.jinja2 | 2 +- .../bootstrap.d/10-user-application.sh | 0 .../conf/provision/bootstrap.d/20-app.sh | 0 docker/base/centos-7/Dockerfile | 30 - docker/base/centos-7/Dockerfile.jinja2 | 13 - .../base/centos-7/conf/bin/service.d/cron.sh | 14 - docker/base/centos-7/conf/etc/cron/.gitkeep | 0 .../centos-7/conf/etc/supervisor.d/.gitkeep | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../centos-7/conf/provision/build.d/.gitkeep | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../centos-7/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 docker/base/debian-10/Dockerfile | 29 - docker/base/debian-10/Dockerfile.jinja2 | 13 - docker/base/debian-10/conf/VERSION | 1 - docker/base/debian-10/conf/bin/bootstrap.sh | 3 - docker/base/debian-10/conf/bin/config.sh | 117 - docker/base/debian-10/conf/bin/control.sh | 160 - .../debian-10/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../debian-10/conf/bin/entrypoint.d/noop.sh | 7 - .../debian-10/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - docker/base/debian-10/conf/bin/entrypoint.sh | 46 - docker/base/debian-10/conf/bin/provision | 8 - docker/base/debian-10/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../debian-10/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../debian-10/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../base/debian-10/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../debian-10/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../debian-10/conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../debian-10/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../base/debian-10/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - docker/base/debian-10/conf/etc/cron/.gitkeep | 0 .../debian-10/conf/etc/logrotate.d/syslog-ng | 38 - .../base/debian-10/conf/etc/supervisor.conf | 20 - .../debian-10/conf/etc/supervisor.d/.gitkeep | 0 .../debian-10/conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../debian-10/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../base/debian-10/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../debian-10/conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../debian-10/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../debian-10/conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../debian-10/conf/provision/variables.yml | 7 - docker/base/debian-7/Dockerfile | 29 - docker/base/debian-7/Dockerfile.jinja2 | 13 - docker/base/debian-7/conf/VERSION | 1 - docker/base/debian-7/conf/bin/bootstrap.sh | 3 - docker/base/debian-7/conf/bin/config.sh | 117 - docker/base/debian-7/conf/bin/control.sh | 160 - .../debian-7/conf/bin/entrypoint.d/cli.sh | 19 - .../debian-7/conf/bin/entrypoint.d/default.sh | 3 - .../debian-7/conf/bin/entrypoint.d/noop.sh | 7 - .../debian-7/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - docker/base/debian-7/conf/bin/entrypoint.sh | 46 - docker/base/debian-7/conf/bin/provision | 8 - docker/base/debian-7/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../base/debian-7/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../debian-7/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../debian-7/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../base/debian-7/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../debian-7/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../debian-7/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../debian-7/conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../debian-7/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - docker/base/debian-7/conf/bin/usr-bin/service | 86 - .../debian-7/conf/bin/usr-bin/version-compare | 43 - docker/base/debian-7/conf/etc/cron/.gitkeep | 0 .../debian-7/conf/etc/logrotate.d/syslog-ng | 38 - docker/base/debian-7/conf/etc/supervisor.conf | 20 - .../debian-7/conf/etc/supervisor.d/.gitkeep | 0 .../debian-7/conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../debian-7/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../base/debian-7/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../debian-7/conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../debian-7/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-7/conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../debian-7/conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../debian-7/conf/provision/variables.yml | 7 - docker/base/debian-8/Dockerfile | 29 - docker/base/debian-8/Dockerfile.jinja2 | 13 - docker/base/debian-8/conf/VERSION | 1 - docker/base/debian-8/conf/bin/bootstrap.sh | 3 - docker/base/debian-8/conf/bin/config.sh | 117 - docker/base/debian-8/conf/bin/control.sh | 160 - .../debian-8/conf/bin/entrypoint.d/cli.sh | 19 - .../debian-8/conf/bin/entrypoint.d/default.sh | 3 - .../debian-8/conf/bin/entrypoint.d/noop.sh | 7 - .../debian-8/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - docker/base/debian-8/conf/bin/entrypoint.sh | 46 - docker/base/debian-8/conf/bin/provision | 8 - docker/base/debian-8/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../base/debian-8/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../debian-8/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../debian-8/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../base/debian-8/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../debian-8/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../debian-8/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../debian-8/conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../debian-8/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - docker/base/debian-8/conf/bin/usr-bin/service | 86 - .../debian-8/conf/bin/usr-bin/version-compare | 43 - docker/base/debian-8/conf/etc/cron/.gitkeep | 0 .../debian-8/conf/etc/logrotate.d/syslog-ng | 38 - docker/base/debian-8/conf/etc/supervisor.conf | 20 - .../debian-8/conf/etc/supervisor.d/.gitkeep | 0 .../debian-8/conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../debian-8/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../base/debian-8/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../debian-8/conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../debian-8/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-8/conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../debian-8/conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../debian-8/conf/provision/variables.yml | 7 - docker/base/debian-9/Dockerfile | 29 - docker/base/debian-9/Dockerfile.jinja2 | 13 - docker/base/debian-9/conf/VERSION | 1 - docker/base/debian-9/conf/bin/bootstrap.sh | 3 - docker/base/debian-9/conf/bin/config.sh | 117 - docker/base/debian-9/conf/bin/control.sh | 160 - .../debian-9/conf/bin/entrypoint.d/cli.sh | 19 - .../debian-9/conf/bin/entrypoint.d/default.sh | 3 - .../debian-9/conf/bin/entrypoint.d/noop.sh | 7 - .../debian-9/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - docker/base/debian-9/conf/bin/entrypoint.sh | 46 - docker/base/debian-9/conf/bin/provision | 8 - docker/base/debian-9/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../base/debian-9/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../debian-9/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../debian-9/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../base/debian-9/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../debian-9/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../debian-9/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../debian-9/conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../debian-9/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - docker/base/debian-9/conf/bin/usr-bin/service | 86 - .../debian-9/conf/bin/usr-bin/version-compare | 43 - docker/base/debian-9/conf/etc/cron/.gitkeep | 0 .../debian-9/conf/etc/logrotate.d/syslog-ng | 38 - docker/base/debian-9/conf/etc/supervisor.conf | 20 - .../debian-9/conf/etc/supervisor.d/.gitkeep | 0 .../debian-9/conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../debian-9/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../base/debian-9/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../debian-9/conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../debian-9/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-9/conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../debian-9/conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../debian-9/conf/provision/variables.yml | 7 - docker/base/ubuntu-12.04/conf/VERSION | 1 - .../base/ubuntu-12.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-12.04/conf/bin/config.sh | 117 - docker/base/ubuntu-12.04/conf/bin/control.sh | 160 - .../ubuntu-12.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-12.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-12.04/conf/bin/provision | 8 - .../base/ubuntu-12.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-12.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-12.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-12.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-12.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-12.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-12.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-12.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-14.04/Dockerfile | 29 - docker/base/ubuntu-14.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-14.04/conf/VERSION | 1 - .../base/ubuntu-14.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-14.04/conf/bin/config.sh | 117 - docker/base/ubuntu-14.04/conf/bin/control.sh | 160 - .../ubuntu-14.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-14.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-14.04/conf/bin/provision | 8 - .../base/ubuntu-14.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-14.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-14.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-14.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-14.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-14.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-14.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-14.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-15.04/Dockerfile | 29 - docker/base/ubuntu-15.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-15.04/conf/VERSION | 1 - .../base/ubuntu-15.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-15.04/conf/bin/config.sh | 117 - docker/base/ubuntu-15.04/conf/bin/control.sh | 160 - .../ubuntu-15.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-15.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-15.04/conf/bin/provision | 8 - .../base/ubuntu-15.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-15.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-15.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-15.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-15.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-15.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-15.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-15.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-15.10/Dockerfile | 29 - docker/base/ubuntu-15.10/Dockerfile.jinja2 | 13 - docker/base/ubuntu-15.10/conf/VERSION | 1 - .../base/ubuntu-15.10/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-15.10/conf/bin/config.sh | 117 - docker/base/ubuntu-15.10/conf/bin/control.sh | 160 - .../ubuntu-15.10/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-15.10/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-15.10/conf/bin/provision | 8 - .../base/ubuntu-15.10/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-15.10/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-15.10/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-15.10/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-15.10/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-15.10/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-15.10/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-15.10/conf/provision/variables.yml | 7 - docker/base/ubuntu-16.04/Dockerfile | 29 - docker/base/ubuntu-16.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-16.04/conf/VERSION | 1 - .../base/ubuntu-16.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-16.04/conf/bin/config.sh | 117 - docker/base/ubuntu-16.04/conf/bin/control.sh | 160 - .../ubuntu-16.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-16.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-16.04/conf/bin/provision | 8 - .../base/ubuntu-16.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-16.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-16.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-16.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-16.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-16.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-16.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-16.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-16.10/Dockerfile | 29 - docker/base/ubuntu-16.10/Dockerfile.jinja2 | 13 - docker/base/ubuntu-16.10/conf/VERSION | 1 - .../base/ubuntu-16.10/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-16.10/conf/bin/config.sh | 117 - docker/base/ubuntu-16.10/conf/bin/control.sh | 160 - .../ubuntu-16.10/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-16.10/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-16.10/conf/bin/provision | 8 - .../base/ubuntu-16.10/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-16.10/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-16.10/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-16.10/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-16.10/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-16.10/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-16.10/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-16.10/conf/provision/variables.yml | 7 - docker/base/ubuntu-17.04/Dockerfile | 29 - docker/base/ubuntu-17.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-17.04/conf/VERSION | 1 - .../base/ubuntu-17.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-17.04/conf/bin/config.sh | 117 - docker/base/ubuntu-17.04/conf/bin/control.sh | 160 - .../ubuntu-17.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-17.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-17.04/conf/bin/provision | 8 - .../base/ubuntu-17.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-17.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-17.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-17.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-17.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-17.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-17.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-17.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-17.10/Dockerfile | 29 - docker/base/ubuntu-17.10/Dockerfile.jinja2 | 13 - docker/base/ubuntu-17.10/conf/VERSION | 1 - .../base/ubuntu-17.10/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-17.10/conf/bin/config.sh | 117 - docker/base/ubuntu-17.10/conf/bin/control.sh | 160 - .../ubuntu-17.10/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-17.10/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-17.10/conf/bin/provision | 8 - .../base/ubuntu-17.10/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-17.10/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-17.10/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-17.10/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-17.10/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-17.10/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-17.10/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-17.10/conf/provision/variables.yml | 7 - docker/base/ubuntu-18.04/Dockerfile | 29 - docker/base/ubuntu-18.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-18.04/conf/VERSION | 1 - .../base/ubuntu-18.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-18.04/conf/bin/config.sh | 117 - docker/base/ubuntu-18.04/conf/bin/control.sh | 160 - .../ubuntu-18.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-18.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-18.04/conf/bin/provision | 8 - .../base/ubuntu-18.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-18.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-18.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-18.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-18.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-18.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-18.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-18.04/conf/provision/variables.yml | 7 - docker/base/ubuntu-20.04/Dockerfile | 29 - docker/base/ubuntu-20.04/Dockerfile.jinja2 | 13 - docker/base/ubuntu-20.04/conf/VERSION | 1 - .../base/ubuntu-20.04/conf/bin/bootstrap.sh | 3 - docker/base/ubuntu-20.04/conf/bin/config.sh | 117 - docker/base/ubuntu-20.04/conf/bin/control.sh | 160 - .../ubuntu-20.04/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../conf/bin/entrypoint.d/noop.sh | 7 - .../conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../base/ubuntu-20.04/conf/bin/entrypoint.sh | 46 - docker/base/ubuntu-20.04/conf/bin/provision | 8 - .../base/ubuntu-20.04/conf/bin/provision.py | 328 -- .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../ubuntu-20.04/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../ubuntu-20.04/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../conf/bin/usr-bin/docker-cronjob | 26 - .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../ubuntu-20.04/conf/bin/usr-bin/service | 86 - .../conf/bin/usr-bin/version-compare | 43 - .../base/ubuntu-20.04/conf/etc/cron/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 38 - .../ubuntu-20.04/conf/etc/supervisor.conf | 20 - .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 - .../ubuntu-20.04/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/onbuild.d/.gitkeep | 0 .../conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../ubuntu-20.04/conf/provision/variables.yml | 7 - .../{ubuntu-12.04 => ubuntu-22.04}/Dockerfile | 4 +- .../Dockerfile.jinja2 | 2 +- .../{centos-7 => ubuntu-22.04}/conf/VERSION | 0 .../conf/bin/bootstrap.sh | 0 .../conf/bin/config.sh | 0 .../conf/bin/control.sh | 0 .../conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../conf/bin/entrypoint.d/noop.sh | 0 .../conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../conf/bin/entrypoint.sh | 0 .../conf/bin/provision | 0 .../conf/bin/provision.py | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../bin/usr-bin/container-file-auto-restore | 0 .../conf/bin/usr-bin/docker-ansible-install | 0 .../conf/bin/usr-bin/docker-cronjob | 0 .../conf/bin/usr-bin/docker-provision | 0 .../conf/bin/usr-bin/docker-service | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../conf/bin/usr-bin/service | 0 .../conf/bin/usr-bin/version-compare | 0 .../ubuntu-22.04/conf/etc/cron}/.gitkeep | 0 .../conf/etc/logrotate.d/syslog-ng | 0 .../conf/etc/supervisor.conf | 0 .../conf/etc/supervisor.d}/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d}/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 0 .../provision/bootstrap.d/10-permissions.sh | 0 .../provision/bootstrap.d/10-supervisor.sh | 0 .../conf/provision/bootstrap.d/90-cleanup.sh | 0 .../conf/provision/build.d}/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d}/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/onbuild.d}/.gitkeep | 0 .../conf/provision/roles}/.gitkeep | 0 .../conf/provision/service.d}/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/service.d/syslog.sh | 0 .../conf/provision/variables-webdevops.yml | 0 .../conf/provision/variables.yml | 0 docker/bootstrap/centos-7/Dockerfile | 32 - docker/bootstrap/centos-7/Dockerfile.jinja2 | 13 - docker/bootstrap/debian-10/Dockerfile | 38 - docker/bootstrap/debian-10/Dockerfile.jinja2 | 11 - docker/bootstrap/debian-7/Dockerfile | 38 - docker/bootstrap/debian-7/Dockerfile.jinja2 | 11 - docker/bootstrap/debian-8/Dockerfile | 38 - docker/bootstrap/debian-8/Dockerfile.jinja2 | 11 - docker/bootstrap/debian-9/Dockerfile | 38 - docker/bootstrap/debian-9/Dockerfile.jinja2 | 11 - docker/bootstrap/ubuntu-12.04/Dockerfile | 42 - .../bootstrap/ubuntu-12.04/Dockerfile.jinja2 | 13 - .../bootstrap/ubuntu-14.04/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-15.04/Dockerfile | 42 - .../bootstrap/ubuntu-15.04/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-15.10/Dockerfile | 42 - .../bootstrap/ubuntu-15.10/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-16.04/Dockerfile | 37 - docker/bootstrap/ubuntu-16.10/Dockerfile | 42 - .../bootstrap/ubuntu-16.10/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-17.04/Dockerfile | 42 - .../bootstrap/ubuntu-17.04/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-17.10/Dockerfile | 37 - .../bootstrap/ubuntu-17.10/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-18.04/Dockerfile | 37 - .../bootstrap/ubuntu-18.04/Dockerfile.jinja2 | 13 - docker/bootstrap/ubuntu-20.04/Dockerfile | 37 - .../bootstrap/ubuntu-20.04/Dockerfile.jinja2 | 13 - .../{ubuntu-14.04 => ubuntu-22.04}/Dockerfile | 4 +- .../Dockerfile.jinja2 | 2 +- docker/certbot/README.md | 44 - docker/certbot/latest/Dockerfile | 23 - docker/certbot/latest/Dockerfile.jinja2 | 9 - docker/dockerfile-build-env/latest/Dockerfile | 2 +- .../latest/Dockerfile.jinja2 | 2 +- docker/liquibase/latest/Dockerfile | 47 - docker/liquibase/latest/Dockerfile.jinja2 | 14 - .../liquibase/latest/conf/bin/entrypoint.sh | 175 - docker/liquibase/mysql/Dockerfile | 47 - docker/liquibase/mysql/Dockerfile.jinja2 | 14 - docker/liquibase/mysql/conf/bin/entrypoint.sh | 175 - docker/liquibase/postgres/Dockerfile | 47 - docker/liquibase/postgres/Dockerfile.jinja2 | 14 - .../liquibase/postgres/conf/bin/entrypoint.sh | 175 - docker/liquidsoap/latest/Dockerfile | 45 - docker/liquidsoap/latest/Dockerfile.jinja2 | 40 - .../conf/bin/entrypoint.d/liquidsoap.sh | 11 - .../latest/conf/etc/liquidsoap/default.liq | 88 - .../latest/conf/etc/liquidsoap/default.mp3 | Bin 4409 -> 0 bytes .../conf/etc/liquidsoap/playlist-day.pls | 1 - .../conf/etc/liquidsoap/playlist-night.pls | 1 - docker/mail-sandbox/README.md | 18 - docker/mail-sandbox/latest/Dockerfile | 35 - docker/mail-sandbox/latest/Dockerfile.jinja2 | 15 - .../conf/bin/service.d/dovecot.d/10-init.sh | 1 - .../latest/conf/bin/service.d/dovecot.sh | 10 - .../latest/conf/etc/dovecot/local.conf | 5 - .../latest/conf/etc/roundcube/config.php | 18 - .../webdevops_autologin.php | 32 - .../latest/conf/etc/supervisor.d/dovecot.conf | 10 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/20-dovecot.sh | 4 - .../conf/provision/bootstrap.d/20-postfix.sh | 19 - .../provision/entrypoint.d/20-mail-sandbox.sh | 28 - .../conf/provision/entrypoint.d/20-postfix.sh | 10 - docker/nginx-dev/README.md | 61 - docker/nginx-dev/alpine/Dockerfile | 12 - docker/nginx-dev/alpine/Dockerfile.jinja2 | 7 - .../alpine/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/centos-7/Dockerfile | 12 - docker/nginx-dev/centos-7/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/debian-10/Dockerfile | 12 - docker/nginx-dev/debian-10/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/debian-7/Dockerfile | 12 - docker/nginx-dev/debian-7/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/debian-8/Dockerfile | 12 - docker/nginx-dev/debian-8/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/debian-9/Dockerfile | 12 - docker/nginx-dev/debian-9/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-12.04/Dockerfile | 12 - .../nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-14.04/Dockerfile | 12 - .../nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-15.04/Dockerfile | 12 - .../nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-15.10/Dockerfile | 12 - .../nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-16.04/Dockerfile | 12 - .../nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-16.10/Dockerfile | 12 - .../nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-17.04/Dockerfile | 12 - .../nginx-dev/ubuntu-17.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-17.10/Dockerfile | 12 - .../nginx-dev/ubuntu-17.10/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx-dev/ubuntu-18.04/Dockerfile | 12 - .../nginx-dev/ubuntu-18.04/Dockerfile.jinja2 | 7 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/nginx/centos-7/Dockerfile | 24 - docker/nginx/centos-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../centos-7/conf/bin/service.d/nginx.sh | 10 - .../centos-7/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../nginx/centos-7/conf/etc/nginx/global.conf | 1 - .../nginx/centos-7/conf/etc/nginx/main.conf | 4 - .../nginx/centos-7/conf/etc/nginx/nginx.conf | 34 - docker/nginx/centos-7/conf/etc/nginx/php.conf | 1 - .../centos-7/conf/etc/nginx/ssl/server.crt | 28 - .../centos-7/conf/etc/nginx/ssl/server.csr | 26 - .../centos-7/conf/etc/nginx/ssl/server.key | 51 - .../centos-7/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../nginx/centos-7/conf/etc/nginx/vhost.conf | 28 - .../centos-7/conf/etc/nginx/vhost.ssl.conf | 7 - .../centos-7/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/debian-10/Dockerfile | 27 - docker/nginx/debian-10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-10/conf/bin/service.d/nginx.sh | 10 - .../debian-10/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-10/conf/etc/nginx/global.conf | 1 - .../nginx/debian-10/conf/etc/nginx/main.conf | 4 - .../nginx/debian-10/conf/etc/nginx/php.conf | 1 - .../debian-10/conf/etc/nginx/ssl/server.crt | 28 - .../debian-10/conf/etc/nginx/ssl/server.csr | 26 - .../debian-10/conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../nginx/debian-10/conf/etc/nginx/vhost.conf | 28 - .../debian-10/conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/debian-7/Dockerfile | 27 - docker/nginx/debian-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-7/conf/bin/service.d/nginx.sh | 10 - .../debian-7/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../nginx/debian-7/conf/etc/nginx/global.conf | 1 - .../nginx/debian-7/conf/etc/nginx/main.conf | 4 - docker/nginx/debian-7/conf/etc/nginx/php.conf | 1 - .../debian-7/conf/etc/nginx/ssl/server.crt | 28 - .../debian-7/conf/etc/nginx/ssl/server.csr | 26 - .../debian-7/conf/etc/nginx/ssl/server.key | 51 - .../debian-7/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../nginx/debian-7/conf/etc/nginx/vhost.conf | 28 - .../debian-7/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-7/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/debian-8/Dockerfile | 27 - docker/nginx/debian-8/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-8/conf/bin/service.d/nginx.sh | 10 - .../debian-8/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../nginx/debian-8/conf/etc/nginx/global.conf | 1 - .../nginx/debian-8/conf/etc/nginx/main.conf | 4 - docker/nginx/debian-8/conf/etc/nginx/php.conf | 1 - .../debian-8/conf/etc/nginx/ssl/server.crt | 28 - .../debian-8/conf/etc/nginx/ssl/server.csr | 26 - .../debian-8/conf/etc/nginx/ssl/server.key | 51 - .../debian-8/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../nginx/debian-8/conf/etc/nginx/vhost.conf | 28 - .../debian-8/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-8/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/debian-9/Dockerfile | 27 - docker/nginx/debian-9/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-9/conf/bin/service.d/nginx.sh | 10 - .../debian-9/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../nginx/debian-9/conf/etc/nginx/global.conf | 1 - .../nginx/debian-9/conf/etc/nginx/main.conf | 4 - docker/nginx/debian-9/conf/etc/nginx/php.conf | 1 - .../debian-9/conf/etc/nginx/ssl/server.crt | 28 - .../debian-9/conf/etc/nginx/ssl/server.csr | 26 - .../debian-9/conf/etc/nginx/ssl/server.key | 51 - .../debian-9/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../nginx/debian-9/conf/etc/nginx/vhost.conf | 28 - .../debian-9/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-9/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-12.04/Dockerfile | 24 - docker/nginx/ubuntu-12.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-12.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-12.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-12.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-12.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-12.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-14.04/Dockerfile | 24 - docker/nginx/ubuntu-14.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-14.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-14.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-14.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-14.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-14.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-15.04/Dockerfile | 24 - docker/nginx/ubuntu-15.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-15.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-15.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-15.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-15.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-15.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-15.10/Dockerfile | 24 - docker/nginx/ubuntu-15.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-15.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-15.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-15.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-15.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-15.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-16.04/Dockerfile | 24 - docker/nginx/ubuntu-16.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-16.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-16.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-16.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-16.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-16.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-16.10/Dockerfile | 24 - docker/nginx/ubuntu-16.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-16.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-16.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-16.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-16.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-16.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-17.04/Dockerfile | 24 - docker/nginx/ubuntu-17.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-17.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-17.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-17.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-17.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-17.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-17.10/Dockerfile | 24 - docker/nginx/ubuntu-17.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-17.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-17.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-17.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-17.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-17.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/nginx/ubuntu-18.04/Dockerfile | 24 - docker/nginx/ubuntu-18.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-18.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-18.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-18.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-18.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-18.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - .../php-apache-dev/centos-7-php56/Dockerfile | 35 - .../centos-7-php56/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - .../php-apache-dev/centos-7-php7/Dockerfile | 35 - .../centos-7-php7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/centos-7/Dockerfile | 36 - .../php-apache-dev/centos-7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/debian-10/Dockerfile | 39 - .../debian-10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/debian-7/Dockerfile | 39 - .../php-apache-dev/debian-7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - .../php-apache-dev/debian-8-php7/Dockerfile | 39 - .../debian-8-php7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/debian-8/Dockerfile | 39 - .../php-apache-dev/debian-8/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/debian-9/Dockerfile | 39 - .../php-apache-dev/debian-9/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-12.04/Dockerfile | 39 - .../ubuntu-12.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-14.04/Dockerfile | 39 - .../ubuntu-14.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-15.04/Dockerfile | 39 - .../ubuntu-15.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-15.10/Dockerfile | 39 - .../ubuntu-15.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-16.04/Dockerfile | 39 - .../ubuntu-16.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-16.10/Dockerfile | 39 - .../ubuntu-16.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-17.04/Dockerfile | 39 - .../ubuntu-17.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-17.10/Dockerfile | 39 - .../ubuntu-17.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/ubuntu-18.04/Dockerfile | 39 - .../ubuntu-18.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache/centos-7-php56/Dockerfile | 29 - .../centos-7-php56/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../conf/bin/service.d/httpd.sh | 13 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../centos-7-php56/conf/etc/httpd/global.conf | 1 - .../centos-7-php56/conf/etc/httpd/main.conf | 10 - .../centos-7-php56/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../centos-7-php56/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/centos-7-php7/Dockerfile | 29 - .../centos-7-php7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../centos-7-php7/conf/bin/service.d/httpd.sh | 13 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../centos-7-php7/conf/etc/httpd/global.conf | 1 - .../centos-7-php7/conf/etc/httpd/main.conf | 10 - .../centos-7-php7/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../centos-7-php7/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/centos-7/Dockerfile | 29 - docker/php-apache/centos-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../centos-7/conf/bin/service.d/httpd.sh | 13 - .../centos-7/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../centos-7/conf/etc/httpd/global.conf | 1 - .../centos-7/conf/etc/httpd/main.conf | 10 - .../centos-7/conf/etc/httpd/php.conf | 1 - .../centos-7/conf/etc/httpd/ssl/server.crt | 28 - .../centos-7/conf/etc/httpd/ssl/server.csr | 26 - .../centos-7/conf/etc/httpd/ssl/server.key | 51 - .../centos-7/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../centos-7/conf/etc/httpd/vhost.conf | 36 - .../centos-7/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/debian-10/Dockerfile | 30 - docker/php-apache/debian-10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-10/conf/bin/service.d/httpd.sh | 14 - .../debian-10/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-10/conf/etc/httpd/global.conf | 1 - .../debian-10/conf/etc/httpd/main.conf | 10 - .../debian-10/conf/etc/httpd/php.conf | 1 - .../debian-10/conf/etc/httpd/ssl/server.crt | 28 - .../debian-10/conf/etc/httpd/ssl/server.csr | 26 - .../debian-10/conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-10/conf/etc/httpd/vhost.conf | 36 - .../debian-10/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/debian-7/Dockerfile | 34 - docker/php-apache/debian-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-7/conf/bin/service.d/httpd.sh | 14 - .../debian-7/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-7/conf/etc/httpd/global.conf | 1 - .../debian-7/conf/etc/httpd/main.conf | 10 - .../debian-7/conf/etc/httpd/php.conf | 1 - .../debian-7/conf/etc/httpd/ssl/server.crt | 28 - .../debian-7/conf/etc/httpd/ssl/server.csr | 26 - .../debian-7/conf/etc/httpd/ssl/server.key | 51 - .../debian-7/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-7/conf/etc/httpd/vhost.conf | 36 - .../debian-7/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/debian-8-php7/Dockerfile | 33 - .../debian-8-php7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-8-php7/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-8-php7/conf/etc/httpd/global.conf | 1 - .../debian-8-php7/conf/etc/httpd/main.conf | 10 - .../debian-8-php7/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-8-php7/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/debian-8/Dockerfile | 33 - docker/php-apache/debian-8/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-8/conf/bin/service.d/httpd.sh | 14 - .../debian-8/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-8/conf/etc/httpd/global.conf | 1 - .../debian-8/conf/etc/httpd/main.conf | 10 - .../debian-8/conf/etc/httpd/php.conf | 1 - .../debian-8/conf/etc/httpd/ssl/server.crt | 28 - .../debian-8/conf/etc/httpd/ssl/server.csr | 26 - .../debian-8/conf/etc/httpd/ssl/server.key | 51 - .../debian-8/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-8/conf/etc/httpd/vhost.conf | 36 - .../debian-8/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/debian-9/Dockerfile | 30 - docker/php-apache/debian-9/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../debian-9/conf/bin/service.d/httpd.sh | 14 - .../debian-9/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../debian-9/conf/etc/httpd/global.conf | 1 - .../debian-9/conf/etc/httpd/main.conf | 10 - .../debian-9/conf/etc/httpd/php.conf | 1 - .../debian-9/conf/etc/httpd/ssl/server.crt | 28 - .../debian-9/conf/etc/httpd/ssl/server.csr | 26 - .../debian-9/conf/etc/httpd/ssl/server.key | 51 - .../debian-9/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../debian-9/conf/etc/httpd/vhost.conf | 36 - .../debian-9/conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-12.04/Dockerfile | 33 - .../php-apache/ubuntu-12.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-12.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-12.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-12.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-12.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-12.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-14.04/Dockerfile | 33 - .../php-apache/ubuntu-14.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-14.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-14.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-14.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-14.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-14.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-15.04/Dockerfile | 31 - .../php-apache/ubuntu-15.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-15.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-15.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-15.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-15.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-15.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-15.10/Dockerfile | 31 - .../php-apache/ubuntu-15.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-15.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-15.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-15.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-15.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-15.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-16.04/Dockerfile | 31 - .../php-apache/ubuntu-16.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-16.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-16.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-16.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-16.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-16.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-16.10/Dockerfile | 31 - .../php-apache/ubuntu-16.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-16.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-16.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-16.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-16.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-16.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-17.04/Dockerfile | 31 - .../php-apache/ubuntu-17.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-17.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-17.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-17.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-17.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-17.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-17.10/Dockerfile | 31 - .../php-apache/ubuntu-17.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-17.10/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-17.10/conf/etc/httpd/global.conf | 1 - .../ubuntu-17.10/conf/etc/httpd/main.conf | 10 - .../ubuntu-17.10/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-17.10/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/ubuntu-18.04/Dockerfile | 31 - .../php-apache/ubuntu-18.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../ubuntu-18.04/conf/bin/service.d/httpd.sh | 14 - .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 - .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../ubuntu-18.04/conf/etc/httpd/global.conf | 1 - .../ubuntu-18.04/conf/etc/httpd/main.conf | 10 - .../ubuntu-18.04/conf/etc/httpd/php.conf | 1 - .../conf/etc/httpd/ssl/server.crt | 28 - .../conf/etc/httpd/ssl/server.csr | 26 - .../conf/etc/httpd/ssl/server.key | 51 - .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../ubuntu-18.04/conf/etc/httpd/vhost.conf | 36 - .../conf/etc/httpd/vhost.ssl.conf | 26 - .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 - .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-dev/alpine | 1 - docker/php-dev/alpine-3 | 1 - docker/php-dev/alpine-3-php7 | 1 - docker/php-dev/centos-7-php56/Dockerfile | 27 - .../php-dev/centos-7-php56/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/centos-7-php7/Dockerfile | 27 - .../php-dev/centos-7-php7/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/centos-7/Dockerfile | 28 - docker/php-dev/centos-7/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/debian-10/Dockerfile | 31 - docker/php-dev/debian-10/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/debian-7/Dockerfile | 31 - docker/php-dev/debian-7/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/debian-8-php7/Dockerfile | 31 - .../php-dev/debian-8-php7/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/debian-8/Dockerfile | 31 - docker/php-dev/debian-8/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/debian-9/Dockerfile | 31 - docker/php-dev/debian-9/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-12.04/Dockerfile | 31 - docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-14.04/Dockerfile | 31 - docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-15.04/Dockerfile | 31 - docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-15.10/Dockerfile | 31 - docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-16.04/Dockerfile | 31 - docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-16.10/Dockerfile | 31 - docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-17.04/Dockerfile | 31 - docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-17.10/Dockerfile | 31 - docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-dev/ubuntu-18.04/Dockerfile | 31 - docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - docker/php-nginx-dev/alpine | 1 - docker/php-nginx-dev/alpine-3 | 1 - docker/php-nginx-dev/alpine-3-php7 | 1 - .../php-nginx-dev/centos-7-php56/Dockerfile | 35 - .../centos-7-php56/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/centos-7-php7/Dockerfile | 35 - .../centos-7-php7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/centos-7/Dockerfile | 36 - .../php-nginx-dev/centos-7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/debian-10/Dockerfile | 39 - .../php-nginx-dev/debian-10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/debian-7/Dockerfile | 40 - .../php-nginx-dev/debian-7/Dockerfile.jinja2 | 13 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/debian-8-php7/Dockerfile | 39 - .../debian-8-php7/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/debian-8/Dockerfile | 39 - .../php-nginx-dev/debian-8/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/debian-9/Dockerfile | 39 - .../php-nginx-dev/debian-9/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 40 - .../ubuntu-12.04/Dockerfile.jinja2 | 13 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 39 - .../ubuntu-14.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 39 - .../ubuntu-15.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 39 - .../ubuntu-15.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 39 - .../ubuntu-16.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 39 - .../ubuntu-16.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 39 - .../ubuntu-17.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 39 - .../ubuntu-17.10/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 39 - .../ubuntu-18.04/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 - .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 - .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 - .../provision/entrypoint.d/10-php-debugger.sh | 106 - .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx/alpine | 1 - docker/php-nginx/alpine-3 | 1 - docker/php-nginx/alpine-3-php7 | 1 - docker/php-nginx/centos-7-php56/Dockerfile | 25 - .../centos-7-php56/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../centos-7-php56/conf/etc/nginx/global.conf | 1 - .../centos-7-php56/conf/etc/nginx/main.conf | 4 - .../centos-7-php56/conf/etc/nginx/nginx.conf | 34 - .../centos-7-php56/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../centos-7-php56/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/centos-7-php7/Dockerfile | 25 - .../php-nginx/centos-7-php7/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../centos-7-php7/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../centos-7-php7/conf/etc/nginx/global.conf | 1 - .../centos-7-php7/conf/etc/nginx/main.conf | 4 - .../centos-7-php7/conf/etc/nginx/nginx.conf | 34 - .../centos-7-php7/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../centos-7-php7/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/centos-7/Dockerfile | 25 - docker/php-nginx/centos-7/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../centos-7/conf/bin/service.d/nginx.sh | 10 - .../centos-7/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../centos-7/conf/etc/nginx/global.conf | 1 - .../centos-7/conf/etc/nginx/main.conf | 4 - .../centos-7/conf/etc/nginx/nginx.conf | 34 - .../centos-7/conf/etc/nginx/php.conf | 1 - .../centos-7/conf/etc/nginx/ssl/server.crt | 28 - .../centos-7/conf/etc/nginx/ssl/server.csr | 26 - .../centos-7/conf/etc/nginx/ssl/server.key | 51 - .../centos-7/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../centos-7/conf/etc/nginx/vhost.conf | 28 - .../centos-7/conf/etc/nginx/vhost.ssl.conf | 7 - .../centos-7/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/debian-10/Dockerfile | 28 - docker/php-nginx/debian-10/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-10/conf/bin/service.d/nginx.sh | 10 - .../debian-10/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-10/conf/etc/nginx/global.conf | 1 - .../debian-10/conf/etc/nginx/main.conf | 4 - .../debian-10/conf/etc/nginx/php.conf | 1 - .../debian-10/conf/etc/nginx/ssl/server.crt | 28 - .../debian-10/conf/etc/nginx/ssl/server.csr | 26 - .../debian-10/conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../debian-10/conf/etc/nginx/vhost.conf | 28 - .../debian-10/conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/debian-7/Dockerfile | 28 - docker/php-nginx/debian-7/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-7/conf/bin/service.d/nginx.sh | 10 - .../debian-7/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-7/conf/etc/nginx/global.conf | 1 - .../debian-7/conf/etc/nginx/main.conf | 4 - .../debian-7/conf/etc/nginx/php.conf | 1 - .../debian-7/conf/etc/nginx/ssl/server.crt | 28 - .../debian-7/conf/etc/nginx/ssl/server.csr | 26 - .../debian-7/conf/etc/nginx/ssl/server.key | 51 - .../debian-7/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../debian-7/conf/etc/nginx/vhost.conf | 28 - .../debian-7/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-7/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/debian-8-php7/Dockerfile | 28 - .../php-nginx/debian-8-php7/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-8-php7/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-8-php7/conf/etc/nginx/global.conf | 1 - .../debian-8-php7/conf/etc/nginx/main.conf | 4 - .../debian-8-php7/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../debian-8-php7/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/debian-8/Dockerfile | 28 - docker/php-nginx/debian-8/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-8/conf/bin/service.d/nginx.sh | 10 - .../debian-8/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-8/conf/etc/nginx/global.conf | 1 - .../debian-8/conf/etc/nginx/main.conf | 4 - .../debian-8/conf/etc/nginx/php.conf | 1 - .../debian-8/conf/etc/nginx/ssl/server.crt | 28 - .../debian-8/conf/etc/nginx/ssl/server.csr | 26 - .../debian-8/conf/etc/nginx/ssl/server.key | 51 - .../debian-8/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../debian-8/conf/etc/nginx/vhost.conf | 28 - .../debian-8/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-8/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/debian-9/Dockerfile | 28 - docker/php-nginx/debian-9/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../debian-9/conf/bin/service.d/nginx.sh | 10 - .../debian-9/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../debian-9/conf/etc/nginx/global.conf | 1 - .../debian-9/conf/etc/nginx/main.conf | 4 - .../debian-9/conf/etc/nginx/php.conf | 1 - .../debian-9/conf/etc/nginx/ssl/server.crt | 28 - .../debian-9/conf/etc/nginx/ssl/server.csr | 26 - .../debian-9/conf/etc/nginx/ssl/server.key | 51 - .../debian-9/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../debian-9/conf/etc/nginx/vhost.conf | 28 - .../debian-9/conf/etc/nginx/vhost.ssl.conf | 7 - .../debian-9/conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-12.04/Dockerfile | 25 - .../php-nginx/ubuntu-12.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-12.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-12.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-12.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-12.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-12.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-14.04/Dockerfile | 25 - .../php-nginx/ubuntu-14.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-14.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-14.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-14.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-14.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-14.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-15.04/Dockerfile | 25 - .../php-nginx/ubuntu-15.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-15.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-15.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-15.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-15.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-15.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-15.10/Dockerfile | 25 - .../php-nginx/ubuntu-15.10/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-15.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-15.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-15.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-15.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-15.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-16.04/Dockerfile | 25 - .../php-nginx/ubuntu-16.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-16.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-16.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-16.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-16.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-16.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-16.10/Dockerfile | 25 - .../php-nginx/ubuntu-16.10/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-16.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-16.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-16.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-16.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-16.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-17.04/Dockerfile | 25 - .../php-nginx/ubuntu-17.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-17.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-17.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-17.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-17.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-17.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-17.10/Dockerfile | 25 - .../php-nginx/ubuntu-17.10/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-17.10/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-17.10/conf/etc/nginx/global.conf | 1 - .../ubuntu-17.10/conf/etc/nginx/main.conf | 4 - .../ubuntu-17.10/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-17.10/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-18.04/Dockerfile | 25 - .../php-nginx/ubuntu-18.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-18.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-18.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-18.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-18.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-18.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php-nginx/ubuntu-20.04/Dockerfile | 25 - .../php-nginx/ubuntu-20.04/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../ubuntu-20.04/conf/bin/service.d/nginx.sh | 10 - .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../ubuntu-20.04/conf/etc/nginx/global.conf | 1 - .../ubuntu-20.04/conf/etc/nginx/main.conf | 4 - .../ubuntu-20.04/conf/etc/nginx/php.conf | 1 - .../conf/etc/nginx/ssl/server.crt | 28 - .../conf/etc/nginx/ssl/server.csr | 26 - .../conf/etc/nginx/ssl/server.key | 51 - .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../ubuntu-20.04/conf/etc/nginx/vhost.conf | 28 - .../conf/etc/nginx/vhost.ssl.conf | 7 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 - .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 - docker/php/alpine | 1 - docker/php/centos-7-php56/Dockerfile | 67 - docker/php/centos-7-php56/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../conf/etc/php/conf.d/.gitkeep | 0 .../centos-7-php56/conf/etc/php/fpm/.gitkeep | 0 .../php/centos-7-php56/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/centos-7-php7/Dockerfile | 71 - docker/php/centos-7-php7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../conf/etc/php/conf.d/.gitkeep | 0 .../centos-7-php7/conf/etc/php/fpm/.gitkeep | 0 docker/php/centos-7-php7/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/centos-7/Dockerfile | 72 - docker/php/centos-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../centos-7/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../centos-7/conf/etc/logrotate.d/php5-fpm | 12 - .../php/centos-7/conf/etc/php/conf.d/.gitkeep | 0 docker/php/centos-7/conf/etc/php/fpm/.gitkeep | 0 docker/php/centos-7/conf/etc/php/php.ini | 1 - .../centos-7/conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/debian-10/Dockerfile | 68 - docker/php/debian-10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../debian-10/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../debian-10/conf/etc/logrotate.d/php5-fpm | 12 - .../debian-10/conf/etc/php/conf.d/.gitkeep | 0 .../php/debian-10/conf/etc/php/fpm/.gitkeep | 0 docker/php/debian-10/conf/etc/php/php.ini | 1 - .../debian-10/conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/debian-7/Dockerfile | 61 - docker/php/debian-7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../debian-7/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../debian-7/conf/etc/logrotate.d/php5-fpm | 12 - .../php/debian-7/conf/etc/php/conf.d/.gitkeep | 0 docker/php/debian-7/conf/etc/php/fpm/.gitkeep | 0 docker/php/debian-7/conf/etc/php/php.ini | 1 - .../debian-7/conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/debian-8-php7/Dockerfile | 79 - docker/php/debian-8-php7/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../conf/etc/php/conf.d/.gitkeep | 0 .../debian-8-php7/conf/etc/php/fpm/.gitkeep | 0 docker/php/debian-8-php7/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/debian-8/Dockerfile | 62 - docker/php/debian-8/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../debian-8/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../debian-8/conf/etc/logrotate.d/php5-fpm | 12 - .../php/debian-8/conf/etc/php/conf.d/.gitkeep | 0 docker/php/debian-8/conf/etc/php/fpm/.gitkeep | 0 docker/php/debian-8/conf/etc/php/php.ini | 1 - .../debian-8/conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/debian-9/Dockerfile | 70 - docker/php/debian-9/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../debian-9/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../debian-9/conf/etc/logrotate.d/php5-fpm | 12 - .../php/debian-9/conf/etc/php/conf.d/.gitkeep | 0 docker/php/debian-9/conf/etc/php/fpm/.gitkeep | 0 docker/php/debian-9/conf/etc/php/php.ini | 1 - .../debian-9/conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-12.04/Dockerfile | 62 - docker/php/ubuntu-12.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-12.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-12.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-12.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-14.04/Dockerfile | 63 - docker/php/ubuntu-14.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-14.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-14.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-14.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-15.04/Dockerfile | 63 - docker/php/ubuntu-15.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-15.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-15.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-15.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-15.10/Dockerfile | 63 - docker/php/ubuntu-15.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-15.10/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-15.10/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-15.10/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-16.04/Dockerfile | 70 - docker/php/ubuntu-16.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-16.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-16.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-16.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-16.10/Dockerfile | 70 - docker/php/ubuntu-16.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-16.10/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-16.10/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-16.10/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-17.04/Dockerfile | 70 - docker/php/ubuntu-17.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-17.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-17.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-17.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-17.10/Dockerfile | 70 - docker/php/ubuntu-17.10/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-17.10/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-17.10/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-17.10/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-18.04/Dockerfile | 69 - docker/php/ubuntu-18.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-18.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-18.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-18.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/php/ubuntu-20.04/Dockerfile | 69 - docker/php/ubuntu-20.04/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 - .../conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/usr-bin/docker-php-setting | 44 - .../conf/etc/logrotate.d/php5-fpm | 12 - .../ubuntu-20.04/conf/etc/php/conf.d/.gitkeep | 0 .../ubuntu-20.04/conf/etc/php/fpm/.gitkeep | 0 docker/php/ubuntu-20.04/conf/etc/php/php.ini | 1 - .../conf/etc/php/php.webdevops.ini | 34 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../conf/provision/bootstrap.d/11-php-conf.sh | 134 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 - .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 - .../provision/bootstrap.d/20-setup-php.sh | 35 - .../provision/bootstrap.d/30-setup-ioncube.sh | 45 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 - .../conf/provision/entrypoint.d/20-php.sh | 75 - docker/piwik/README.md | 19 - docker/piwik/latest/Dockerfile | 24 - docker/piwik/latest/Dockerfile.jinja2 | 13 - docker/piwik/latest/conf/bin/piwik-cron.sh | 10 - docker/piwik/latest/conf/bin/piwik-env.sh | 1 - docker/piwik/latest/conf/etc/cron/crontab | 1 - docker/piwik/latest/conf/etc/php/php.ini | 40 - .../provision/entrypoint.d/10-piwik-env.sh | 1 - docker/postfix/README.md | 16 - docker/postfix/latest/Dockerfile | 16 - docker/postfix/latest/Dockerfile.jinja2 | 10 - .../conf/provision/bootstrap.d/.gitkeep | 0 docker/samson-deployment/README.md | 17 - docker/samson-deployment/latest/Dockerfile | 195 - .../latest/Dockerfile.jinja2 | 55 - docker/samson-deployment/latest/conf/VERSION | 1 - .../latest/conf/bin/bootstrap.sh | 3 - .../latest/conf/bin/config.sh | 117 - .../latest/conf/bin/control.sh | 160 - .../latest/conf/bin/entrypoint.d/cli.sh | 19 - .../latest/conf/bin/entrypoint.d/default.sh | 3 - .../latest/conf/bin/entrypoint.d/noop.sh | 7 - .../latest/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../latest/conf/bin/entrypoint.sh | 46 - .../latest/conf/bin/provision | 8 - .../latest/conf/bin/provision.py | 328 -- .../latest/conf/bin/samson-cleanup-db.sh | 18 - .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../latest/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 - .../latest/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/nginx.d/10-init.sh | 10 - .../latest/conf/bin/service.d/nginx.sh | 7 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 - .../latest/conf/bin/service.d/postfix.sh | 42 - .../conf/bin/service.d/samson.d/10-init.sh | 7 - .../latest/conf/bin/service.d/samson.sh | 19 - .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../latest/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../latest/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../latest/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 - .../conf/bin/usr-bin/docker-ansible-install | 77 - .../latest/conf/bin/usr-bin/docker-cronjob | 26 - .../latest/conf/bin/usr-bin/docker-provision | 9 - .../latest/conf/bin/usr-bin/docker-service | 89 - .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../latest/conf/bin/usr-bin/service | 86 - .../latest/conf/bin/usr-bin/version-compare | 43 - .../latest/conf/etc/cron/.gitkeep | 0 .../latest/conf/etc/logrotate.d/syslog-ng | 38 - .../latest/conf/etc/nginx/vhost.conf | 38 - .../latest/conf/etc/supervisor.conf | 20 - .../latest/conf/etc/supervisor.d/.gitkeep | 0 .../latest/conf/etc/supervisor.d/cron.conf | 14 - .../latest/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../latest/conf/etc/supervisor.d/docker.conf | 12 - .../latest/conf/etc/supervisor.d/nginx.conf | 14 - .../latest/conf/etc/supervisor.d/postfix.conf | 15 - .../latest/conf/etc/supervisor.d/samson.conf | 14 - .../latest/conf/etc/supervisor.d/ssh.conf | 14 - .../latest/conf/etc/supervisor.d/syslog.conf | 13 - .../latest/conf/etc/syslog-ng/syslog-ng.conf | 48 - .../latest/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../latest/conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../latest/conf/provision/onbuild.d/.gitkeep | 0 .../latest/conf/provision/roles/.gitkeep | 0 .../defaults/main.yml | 4 - .../tasks/bootstrap.yml | 70 - .../tasks/entrypoint.yml | 2 - .../tasks/main.yml | 9 - .../latest/conf/provision/service.d/.gitkeep | 0 .../latest/conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 - .../conf/provision/service.d/postfix.sh | 32 - .../latest/conf/provision/service.d/ssh.sh | 17 - .../latest/conf/provision/service.d/syslog.sh | 41 - .../conf/provision/variables-webdevops.yml | 7 - .../latest/conf/provision/variables.yml | 7 - docker/samson-deployment/latest/crontab | 8 - docker/samson-deployment/latest/database.yml | 23 - docker/samson-deployment/latest/web/502.html | 101 - .../latest/web/logo_light.png | Bin 16903 -> 0 bytes docker/sphinx/latest/Dockerfile | 36 - docker/sphinx/latest/Dockerfile.jinja2 | 6 - docker/sphinx/latest/README.md | 22 - docker/typo3-solr/3.1/Dockerfile | 44 - docker/typo3-solr/3.1/Dockerfile.jinja2 | 30 - docker/typo3-solr/3.1/solr/solr.xml | 41 - .../3.1/solr/typo3cores/conf/admin-extra.html | 14 - .../_schema_analysis_stopwords_arabic.json | 127 - .../solr/typo3cores/conf/arabic/protwords.txt | 1 - .../solr/typo3cores/conf/arabic/schema.xml | 144 - .../solr/typo3cores/conf/arabic/synonyms.txt | 17 - .../_schema_analysis_stopwords_armenian.json | 53 - .../typo3cores/conf/armenian/protwords.txt | 1 - .../solr/typo3cores/conf/armenian/schema.xml | 134 - .../typo3cores/conf/armenian/synonyms.txt | 17 - .../_schema_analysis_stopwords_basque.json | 106 - .../solr/typo3cores/conf/basque/protwords.txt | 1 - .../solr/typo3cores/conf/basque/schema.xml | 136 - .../solr/typo3cores/conf/basque/synonyms.txt | 17 - ...alysis_stopwords_brazilian_portuguese.json | 136 - .../conf/brazilian_portuguese/protwords.txt | 1 - .../conf/brazilian_portuguese/schema.xml | 138 - .../conf/brazilian_portuguese/synonyms.txt | 17 - .../_schema_analysis_stopwords_bulgarian.json | 198 - .../typo3cores/conf/bulgarian/protwords.txt | 1 - .../solr/typo3cores/conf/bulgarian/schema.xml | 140 - .../typo3cores/conf/bulgarian/synonyms.txt | 17 - .../_schema_analysis_stopwords_burmese.json | 9 - .../typo3cores/conf/burmese/protwords.txt | 1 - .../solr/typo3cores/conf/burmese/readme.txt | 4 - .../solr/typo3cores/conf/burmese/schema.xml | 75 - .../solr/typo3cores/conf/burmese/synonyms.txt | 1 - .../_schema_analysis_stopwords_catalan.json | 227 - .../typo3cores/conf/catalan/protwords.txt | 1 - .../solr/typo3cores/conf/catalan/schema.xml | 134 - .../solr/typo3cores/conf/catalan/synonyms.txt | 17 - .../_schema_analysis_stopwords_chinese.json | 9 - .../typo3cores/conf/chinese/protwords.txt | 1 - .../solr/typo3cores/conf/chinese/schema.xml | 75 - .../solr/typo3cores/conf/chinese/synonyms.txt | 1 - .../3.1/solr/typo3cores/conf/currency.xml | 67 - .../_schema_analysis_stopwords_czech.json | 180 - .../solr/typo3cores/conf/czech/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/czech/schema.xml | 136 - .../solr/typo3cores/conf/czech/synonyms.txt | 17 - .../_schema_analysis_stopwords_danish.json | 102 - .../solr/typo3cores/conf/danish/protwords.txt | 17 - .../solr/typo3cores/conf/danish/schema.xml | 114 - .../solr/typo3cores/conf/danish/synonyms.txt | 17 - .../_schema_analysis_stopwords_dutch.json | 109 - .../solr/typo3cores/conf/dutch/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/dutch/schema.xml | 130 - .../solr/typo3cores/conf/dutch/synonyms.txt | 17 - .../3.1/solr/typo3cores/conf/elevate.xml | 36 - .../_schema_analysis_stopwords_english.json | 182 - .../typo3cores/conf/english/protwords.txt | 1 - .../solr/typo3cores/conf/english/schema.xml | 127 - .../solr/typo3cores/conf/english/synonyms.txt | 17 - .../_schema_analysis_stopwords_finnish.json | 243 -- .../typo3cores/conf/finnish/protwords.txt | 1 - .../solr/typo3cores/conf/finnish/schema.xml | 137 - .../solr/typo3cores/conf/finnish/synonyms.txt | 17 - .../_schema_analysis_stopwords_french.json | 171 - .../solr/typo3cores/conf/french/protwords.txt | 1 - .../solr/typo3cores/conf/french/schema.xml | 125 - .../solr/typo3cores/conf/french/synonyms.txt | 17 - .../_schema_analysis_stopwords_galician.json | 168 - .../typo3cores/conf/galician/protwords.txt | 1 - .../solr/typo3cores/conf/galician/schema.xml | 140 - .../typo3cores/conf/galician/synonyms.txt | 17 - .../typo3cores/conf/general_schema_fields.xml | 229 - .../typo3cores/conf/general_schema_types.xml | 214 - .../_schema_analysis_stopwords_generic.json | 9 - .../typo3cores/conf/generic/protwords.txt | 1 - .../solr/typo3cores/conf/generic/schema.xml | 125 - .../solr/typo3cores/conf/generic/synonyms.txt | 17 - .../_schema_analysis_stopwords_german.json | 239 - .../conf/german/german-common-nouns.txt | 3870 ----------------- .../solr/typo3cores/conf/german/protwords.txt | 1 - .../solr/typo3cores/conf/german/schema.xml | 159 - .../solr/typo3cores/conf/german/synonyms.txt | 17 - .../_schema_analysis_stopwords_greek.json | 83 - .../solr/typo3cores/conf/greek/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/greek/schema.xml | 139 - .../solr/typo3cores/conf/greek/synonyms.txt | 17 - .../_schema_analysis_stopwords_hindi.json | 235 - .../solr/typo3cores/conf/hindi/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/hindi/schema.xml | 147 - .../solr/typo3cores/conf/hindi/synonyms.txt | 17 - .../_schema_analysis_stopwords_hungarian.json | 207 - .../typo3cores/conf/hungarian/protwords.txt | 1 - .../solr/typo3cores/conf/hungarian/schema.xml | 133 - .../typo3cores/conf/hungarian/synonyms.txt | 17 - ..._schema_analysis_stopwords_indonesian.json | 365 -- .../typo3cores/conf/indonesian/protwords.txt | 1 - .../typo3cores/conf/indonesian/schema.xml | 139 - .../typo3cores/conf/indonesian/synonyms.txt | 17 - .../_schema_analysis_stopwords_italian.json | 287 -- .../typo3cores/conf/italian/protwords.txt | 1 - .../solr/typo3cores/conf/italian/schema.xml | 129 - .../solr/typo3cores/conf/italian/synonyms.txt | 17 - .../_schema_analysis_stopwords_japanese.json | 9 - .../typo3cores/conf/japanese/protwords.txt | 1 - .../solr/typo3cores/conf/japanese/schema.xml | 75 - .../typo3cores/conf/japanese/synonyms.txt | 1 - .../_schema_analysis_stopwords_khmer.json | 9 - .../solr/typo3cores/conf/khmer/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/khmer/readme.txt | 4 - .../3.1/solr/typo3cores/conf/khmer/schema.xml | 75 - .../solr/typo3cores/conf/khmer/synonyms.txt | 1 - .../_schema_analysis_stopwords_korean.json | 9 - .../solr/typo3cores/conf/korean/protwords.txt | 1 - .../solr/typo3cores/conf/korean/schema.xml | 75 - .../solr/typo3cores/conf/korean/synonyms.txt | 1 - .../lao/_schema_analysis_stopwords_lao.json | 9 - .../solr/typo3cores/conf/lao/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/lao/readme.txt | 4 - .../3.1/solr/typo3cores/conf/lao/schema.xml | 75 - .../3.1/solr/typo3cores/conf/lao/synonyms.txt | 1 - .../_schema_analysis_stopwords_norwegian.json | 184 - .../typo3cores/conf/norwegian/protwords.txt | 1 - .../solr/typo3cores/conf/norwegian/schema.xml | 135 - .../typo3cores/conf/norwegian/synonyms.txt | 17 - .../_schema_analysis_stopwords_persian.json | 316 -- .../typo3cores/conf/persian/protwords.txt | 1 - .../solr/typo3cores/conf/persian/schema.xml | 143 - .../solr/typo3cores/conf/persian/synonyms.txt | 17 - .../_schema_analysis_stopwords_polish.json | 282 -- .../solr/typo3cores/conf/polish/protwords.txt | 17 - .../solr/typo3cores/conf/polish/schema.xml | 116 - .../solr/typo3cores/conf/polish/synonyms.txt | 17 - ..._schema_analysis_stopwords_portuguese.json | 211 - .../typo3cores/conf/portuguese/protwords.txt | 1 - .../typo3cores/conf/portuguese/schema.xml | 135 - .../typo3cores/conf/portuguese/synonyms.txt | 16 - .../_schema_analysis_stopwords_romanian.json | 238 - .../typo3cores/conf/romanian/protwords.txt | 1 - .../solr/typo3cores/conf/romanian/schema.xml | 133 - .../typo3cores/conf/romanian/synonyms.txt | 17 - .../_schema_analysis_stopwords_russian.json | 167 - .../typo3cores/conf/russian/protwords.txt | 1 - .../solr/typo3cores/conf/russian/schema.xml | 121 - .../solr/typo3cores/conf/russian/synonyms.txt | 17 - .../3.1/solr/typo3cores/conf/solrconfig.xml | 550 --- .../_schema_analysis_stopwords_spanish.json | 316 -- .../typo3cores/conf/spanish/protwords.txt | 1 - .../solr/typo3cores/conf/spanish/schema.xml | 128 - .../solr/typo3cores/conf/spanish/synonyms.txt | 17 - .../_schema_analysis_stopwords_swedish.json | 122 - .../typo3cores/conf/swedish/protwords.txt | 1 - .../solr/typo3cores/conf/swedish/schema.xml | 135 - .../solr/typo3cores/conf/swedish/synonyms.txt | 17 - .../thai/_schema_analysis_stopwords_thai.json | 9 - .../solr/typo3cores/conf/thai/protwords.txt | 1 - .../3.1/solr/typo3cores/conf/thai/schema.xml | 122 - .../solr/typo3cores/conf/thai/synonyms.txt | 1 - .../_schema_analysis_stopwords_turkish.json | 217 - .../typo3cores/conf/turkish/protwords.txt | 1 - .../solr/typo3cores/conf/turkish/schema.xml | 134 - .../solr/typo3cores/conf/turkish/synonyms.txt | 17 - .../_schema_analysis_stopwords_ukrainian.json | 167 - .../typo3cores/conf/ukrainian/protwords.txt | 1 - .../solr/typo3cores/conf/ukrainian/schema.xml | 120 - .../typo3cores/conf/ukrainian/synonyms.txt | 17 - .../conf/velocity/VM_global_library.vm | 161 - .../solr/typo3cores/conf/velocity/browse.vm | 45 - .../3.1/solr/typo3cores/conf/velocity/doc.vm | 39 - .../typo3cores/conf/velocity/facet_fields.vm | 12 - .../solr/typo3cores/conf/velocity/facets.vm | 1 - .../solr/typo3cores/conf/velocity/footer.vm | 16 - .../3.1/solr/typo3cores/conf/velocity/head.vm | 45 - .../solr/typo3cores/conf/velocity/header.vm | 3 - .../3.1/solr/typo3cores/conf/velocity/hit.vm | 5 - .../typo3cores/conf/velocity/hitGrouped.vm | 18 - .../conf/velocity/jquery.autocomplete.css | 48 - .../conf/velocity/jquery.autocomplete.js | 762 ---- .../solr/typo3cores/conf/velocity/layout.vm | 17 - .../solr/typo3cores/conf/velocity/main.css | 182 - .../solr/typo3cores/conf/velocity/query.vm | 54 - .../solr/typo3cores/conf/velocity/suggest.vm | 3 - docker/typo3-solr/4.0 | 1 - docker/typo3-solr/5.0/Dockerfile | 48 - docker/typo3-solr/5.0/Dockerfile.jinja2 | 8 - docker/typo3-solr/5.0/solr/solr.xml | 42 - .../5.0/solr/typo3cores/conf/admin-extra.html | 14 - .../_schema_analysis_stopwords_arabic.json | 127 - .../solr/typo3cores/conf/arabic/protwords.txt | 1 - .../solr/typo3cores/conf/arabic/schema.xml | 147 - .../solr/typo3cores/conf/arabic/synonyms.txt | 17 - .../_schema_analysis_stopwords_armenian.json | 53 - .../typo3cores/conf/armenian/protwords.txt | 1 - .../solr/typo3cores/conf/armenian/schema.xml | 137 - .../typo3cores/conf/armenian/synonyms.txt | 17 - .../_schema_analysis_stopwords_basque.json | 106 - .../solr/typo3cores/conf/basque/protwords.txt | 1 - .../solr/typo3cores/conf/basque/schema.xml | 139 - .../solr/typo3cores/conf/basque/synonyms.txt | 17 - ...alysis_stopwords_brazilian_portuguese.json | 136 - .../conf/brazilian_portuguese/protwords.txt | 1 - .../conf/brazilian_portuguese/schema.xml | 141 - .../conf/brazilian_portuguese/synonyms.txt | 17 - .../_schema_analysis_stopwords_bulgarian.json | 198 - .../typo3cores/conf/bulgarian/protwords.txt | 1 - .../solr/typo3cores/conf/bulgarian/schema.xml | 143 - .../typo3cores/conf/bulgarian/synonyms.txt | 17 - .../_schema_analysis_stopwords_burmese.json | 9 - .../typo3cores/conf/burmese/protwords.txt | 1 - .../solr/typo3cores/conf/burmese/readme.txt | 4 - .../solr/typo3cores/conf/burmese/schema.xml | 75 - .../solr/typo3cores/conf/burmese/synonyms.txt | 1 - .../_schema_analysis_stopwords_catalan.json | 227 - .../typo3cores/conf/catalan/protwords.txt | 1 - .../solr/typo3cores/conf/catalan/schema.xml | 137 - .../solr/typo3cores/conf/catalan/synonyms.txt | 17 - .../_schema_analysis_stopwords_chinese.json | 9 - .../typo3cores/conf/chinese/protwords.txt | 1 - .../solr/typo3cores/conf/chinese/schema.xml | 75 - .../solr/typo3cores/conf/chinese/synonyms.txt | 1 - .../5.0/solr/typo3cores/conf/currency.xml | 67 - .../_schema_analysis_stopwords_czech.json | 180 - .../solr/typo3cores/conf/czech/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/czech/schema.xml | 139 - .../solr/typo3cores/conf/czech/synonyms.txt | 17 - .../_schema_analysis_stopwords_danish.json | 102 - .../solr/typo3cores/conf/danish/protwords.txt | 17 - .../solr/typo3cores/conf/danish/schema.xml | 140 - .../solr/typo3cores/conf/danish/synonyms.txt | 17 - .../_schema_analysis_stopwords_dutch.json | 109 - .../solr/typo3cores/conf/dutch/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/dutch/schema.xml | 141 - .../solr/typo3cores/conf/dutch/synonyms.txt | 17 - .../5.0/solr/typo3cores/conf/elevate.xml | 36 - .../_schema_analysis_stopwords_english.json | 182 - .../typo3cores/conf/english/protwords.txt | 1 - .../solr/typo3cores/conf/english/schema.xml | 139 - .../solr/typo3cores/conf/english/synonyms.txt | 17 - .../_schema_analysis_stopwords_finnish.json | 243 -- .../typo3cores/conf/finnish/protwords.txt | 1 - .../solr/typo3cores/conf/finnish/schema.xml | 140 - .../solr/typo3cores/conf/finnish/synonyms.txt | 17 - .../_schema_analysis_stopwords_french.json | 171 - .../solr/typo3cores/conf/french/protwords.txt | 1 - .../solr/typo3cores/conf/french/schema.xml | 136 - .../solr/typo3cores/conf/french/synonyms.txt | 17 - .../_schema_analysis_stopwords_galician.json | 168 - .../typo3cores/conf/galician/protwords.txt | 1 - .../solr/typo3cores/conf/galician/schema.xml | 143 - .../typo3cores/conf/galician/synonyms.txt | 17 - .../typo3cores/conf/general_schema_fields.xml | 231 - .../typo3cores/conf/general_schema_types.xml | 214 - .../_schema_analysis_stopwords_generic.json | 9 - .../typo3cores/conf/generic/protwords.txt | 1 - .../solr/typo3cores/conf/generic/schema.xml | 136 - .../solr/typo3cores/conf/generic/synonyms.txt | 17 - .../_schema_analysis_stopwords_german.json | 239 - .../conf/german/german-common-nouns.txt | 3870 ----------------- .../solr/typo3cores/conf/german/protwords.txt | 1 - .../solr/typo3cores/conf/german/schema.xml | 162 - .../solr/typo3cores/conf/german/synonyms.txt | 17 - .../_schema_analysis_stopwords_greek.json | 83 - .../solr/typo3cores/conf/greek/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/greek/schema.xml | 142 - .../solr/typo3cores/conf/greek/synonyms.txt | 17 - .../_schema_analysis_stopwords_hindi.json | 235 - .../solr/typo3cores/conf/hindi/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/hindi/schema.xml | 150 - .../solr/typo3cores/conf/hindi/synonyms.txt | 17 - .../_schema_analysis_stopwords_hungarian.json | 207 - .../typo3cores/conf/hungarian/protwords.txt | 1 - .../solr/typo3cores/conf/hungarian/schema.xml | 136 - .../typo3cores/conf/hungarian/synonyms.txt | 17 - ..._schema_analysis_stopwords_indonesian.json | 365 -- .../typo3cores/conf/indonesian/protwords.txt | 1 - .../typo3cores/conf/indonesian/schema.xml | 142 - .../typo3cores/conf/indonesian/synonyms.txt | 17 - .../_schema_analysis_stopwords_italian.json | 287 -- .../typo3cores/conf/italian/protwords.txt | 1 - .../solr/typo3cores/conf/italian/schema.xml | 140 - .../solr/typo3cores/conf/italian/synonyms.txt | 17 - .../_schema_analysis_stopwords_japanese.json | 9 - .../typo3cores/conf/japanese/protwords.txt | 1 - .../solr/typo3cores/conf/japanese/schema.xml | 75 - .../typo3cores/conf/japanese/synonyms.txt | 1 - .../_schema_analysis_stopwords_khmer.json | 9 - .../solr/typo3cores/conf/khmer/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/khmer/readme.txt | 4 - .../5.0/solr/typo3cores/conf/khmer/schema.xml | 75 - .../solr/typo3cores/conf/khmer/synonyms.txt | 1 - .../_schema_analysis_stopwords_korean.json | 9 - .../solr/typo3cores/conf/korean/protwords.txt | 1 - .../solr/typo3cores/conf/korean/schema.xml | 75 - .../solr/typo3cores/conf/korean/synonyms.txt | 1 - .../lao/_schema_analysis_stopwords_lao.json | 9 - .../solr/typo3cores/conf/lao/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/lao/readme.txt | 4 - .../5.0/solr/typo3cores/conf/lao/schema.xml | 75 - .../5.0/solr/typo3cores/conf/lao/synonyms.txt | 1 - .../_schema_analysis_stopwords_norwegian.json | 184 - .../typo3cores/conf/norwegian/protwords.txt | 1 - .../solr/typo3cores/conf/norwegian/schema.xml | 138 - .../typo3cores/conf/norwegian/synonyms.txt | 17 - .../_schema_analysis_stopwords_persian.json | 316 -- .../typo3cores/conf/persian/protwords.txt | 1 - .../solr/typo3cores/conf/persian/schema.xml | 146 - .../solr/typo3cores/conf/persian/synonyms.txt | 17 - .../_schema_analysis_stopwords_polish.json | 282 -- .../solr/typo3cores/conf/polish/protwords.txt | 17 - .../solr/typo3cores/conf/polish/schema.xml | 141 - .../solr/typo3cores/conf/polish/synonyms.txt | 17 - ..._schema_analysis_stopwords_portuguese.json | 211 - .../typo3cores/conf/portuguese/protwords.txt | 1 - .../typo3cores/conf/portuguese/schema.xml | 138 - .../typo3cores/conf/portuguese/synonyms.txt | 16 - .../_schema_analysis_stopwords_romanian.json | 238 - .../typo3cores/conf/romanian/protwords.txt | 1 - .../solr/typo3cores/conf/romanian/schema.xml | 136 - .../typo3cores/conf/romanian/synonyms.txt | 17 - .../_schema_analysis_stopwords_russian.json | 167 - .../typo3cores/conf/russian/protwords.txt | 1 - .../solr/typo3cores/conf/russian/schema.xml | 139 - .../solr/typo3cores/conf/russian/synonyms.txt | 17 - .../5.0/solr/typo3cores/conf/solrconfig.xml | 549 --- .../_schema_analysis_stopwords_spanish.json | 316 -- .../typo3cores/conf/spanish/protwords.txt | 1 - .../solr/typo3cores/conf/spanish/schema.xml | 139 - .../solr/typo3cores/conf/spanish/synonyms.txt | 17 - .../_schema_analysis_stopwords_swedish.json | 122 - .../typo3cores/conf/swedish/protwords.txt | 1 - .../solr/typo3cores/conf/swedish/schema.xml | 138 - .../solr/typo3cores/conf/swedish/synonyms.txt | 17 - .../thai/_schema_analysis_stopwords_thai.json | 9 - .../solr/typo3cores/conf/thai/protwords.txt | 1 - .../5.0/solr/typo3cores/conf/thai/schema.xml | 122 - .../solr/typo3cores/conf/thai/synonyms.txt | 1 - .../_schema_analysis_stopwords_turkish.json | 217 - .../typo3cores/conf/turkish/protwords.txt | 1 - .../solr/typo3cores/conf/turkish/schema.xml | 137 - .../solr/typo3cores/conf/turkish/synonyms.txt | 17 - .../_schema_analysis_stopwords_ukrainian.json | 167 - .../typo3cores/conf/ukrainian/protwords.txt | 1 - .../solr/typo3cores/conf/ukrainian/schema.xml | 138 - .../typo3cores/conf/ukrainian/synonyms.txt | 17 - .../conf/velocity/VM_global_library.vm | 161 - .../solr/typo3cores/conf/velocity/browse.vm | 45 - .../5.0/solr/typo3cores/conf/velocity/doc.vm | 39 - .../typo3cores/conf/velocity/facet_fields.vm | 12 - .../solr/typo3cores/conf/velocity/facets.vm | 1 - .../solr/typo3cores/conf/velocity/footer.vm | 16 - .../5.0/solr/typo3cores/conf/velocity/head.vm | 45 - .../solr/typo3cores/conf/velocity/header.vm | 3 - .../5.0/solr/typo3cores/conf/velocity/hit.vm | 5 - .../typo3cores/conf/velocity/hitGrouped.vm | 18 - .../conf/velocity/jquery.autocomplete.css | 48 - .../conf/velocity/jquery.autocomplete.js | 762 ---- .../solr/typo3cores/conf/velocity/layout.vm | 17 - .../solr/typo3cores/conf/velocity/main.css | 182 - .../solr/typo3cores/conf/velocity/query.vm | 54 - .../solr/typo3cores/conf/velocity/suggest.vm | 3 - docker/typo3-solr/6.0/Dockerfile | 43 - docker/typo3-solr/6.0/Dockerfile.jinja2 | 8 - docker/typo3-solr/6.1/Dockerfile | 43 - docker/typo3-solr/6.1/Dockerfile.jinja2 | 8 - docker/typo3-solr/6.5/Dockerfile | 43 - docker/typo3-solr/6.5/Dockerfile.jinja2 | 8 - docker/typo3-solr/7.0/Dockerfile | 43 - docker/typo3-solr/7.0/Dockerfile.jinja2 | 8 - docker/typo3-solr/7.5/Dockerfile | 43 - docker/typo3-solr/7.5/Dockerfile.jinja2 | 8 - docker/typo3-solr/8.0/Dockerfile | 43 - docker/typo3-solr/8.0/Dockerfile.jinja2 | 8 - docker/typo3-solr/8.1/Dockerfile | 43 - docker/typo3-solr/8.1/Dockerfile.jinja2 | 8 - docker/typo3-solr/latest | 1 - docker/varnish/README.md | 25 - docker/varnish/latest/Dockerfile | 27 - docker/varnish/latest/Dockerfile.jinja2 | 14 - .../latest/conf/bin/entrypoint.d/varnishd.sh | 53 - .../latest/conf/etc/varnish/varnish.vcl | 9 - .../DockerImages/dockerfiles/ansible.rst | 12 - .../DockerImages/dockerfiles/apache-dev.rst | 32 - .../DockerImages/dockerfiles/certbot.rst | 15 - .../DockerImages/dockerfiles/hhvm-apache.rst | 36 - .../DockerImages/dockerfiles/hhvm-nginx.rst | 36 - .../content/DockerImages/dockerfiles/hhvm.rst | 27 - .../DockerImages/dockerfiles/liquibase.rst | 43 - .../DockerImages/dockerfiles/liquidsoap.rst | 55 - .../DockerImages/dockerfiles/mail-sandbox.rst | 39 - .../DockerImages/dockerfiles/nginx-dev.rst | 33 - .../DockerImages/dockerfiles/postfix.rst | 20 - .../dockerfiles/samson-deployment.rst | 41 - .../DockerImages/dockerfiles/sphinx.rst | 25 - .../DockerImages/dockerfiles/typo3-solr.rst | 16 - .../DockerImages/dockerfiles/varnish.rst | 29 - .../general/etc/httpd/conf.d/.gitkeep | 0 .../general/etc/httpd/conf.d/10-php.conf | 37 - .../general/provision/bootstrap.d/10-hhvm.sh | 6 - .../general/etc/nginx/conf.d/.gitkeep | 0 .../general/etc/nginx/conf.d/10-php.conf | 3 - .../general/provision/bootstrap.d/10-hhvm.sh | 6 - .../general/bin/service.d/hhvm.d/10-init.sh | 1 - .../hhvm/general/bin/service.d/hhvm.sh | 14 - .../hhvm/general/etc/supervisor.d/hhvm.conf | 15 - .../general/provision/bootstrap.d/10-hhvm.sh | 11 - .../liquibase/general/bin/entrypoint.sh | 175 - .../bin/service.d/dovecot.d/10-init.sh | 1 - .../general/bin/service.d/dovecot.sh | 10 - .../general/etc/dovecot/local.conf | 5 - .../general/etc/roundcube/config.php | 18 - .../webdevops_autologin.php | 32 - .../general/etc/supervisor.d/dovecot.conf | 10 - .../general/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/20-dovecot.sh | 4 - .../provision/bootstrap.d/20-postfix.sh | 19 - .../provision/entrypoint.d/20-mail-sandbox.sh | 28 - .../provision/entrypoint.d/20-postfix.sh | 10 - provisioning/piwik/general/bin/piwik-cron.sh | 10 - provisioning/piwik/general/bin/piwik-env.sh | 1 - provisioning/piwik/general/etc/cron/crontab | 1 - provisioning/piwik/general/etc/php/php.ini | 40 - .../provision/entrypoint.d/10-piwik-env.sh | 1 - .../general/provision/bootstrap.d/.gitkeep | 0 .../general/bin/samson-cleanup-db.sh | 18 - .../general/bin/service.d/nginx.d/10-init.sh | 10 - .../general/bin/service.d/nginx.sh | 7 - .../general/bin/service.d/samson.d/10-init.sh | 7 - .../general/bin/service.d/samson.sh | 19 - .../general/etc/nginx/vhost.conf | 38 - .../general/etc/supervisor.d/docker.conf | 12 - .../general/etc/supervisor.d/nginx.conf | 14 - .../general/etc/supervisor.d/samson.conf | 14 - .../defaults/main.yml | 4 - .../tasks/bootstrap.yml | 70 - .../tasks/entrypoint.yml | 2 - .../tasks/main.yml | 9 - .../general/provision/bootstrap.d/.gitkeep | 0 .../general/bin/entrypoint.d/varnishd.sh | 53 - .../varnish/general/etc/varnish/varnish.vcl | 9 - sandbox/Dockerfile | 96 - sandbox/code/index.php | 1 - sandbox/docker-compose.yml | 23 - template/Dockerfile/environment.jinja2 | 13 - template/Dockerfile/images/ansible.jinja2 | 104 - template/Dockerfile/images/apache-dev.jinja2 | 5 - template/Dockerfile/images/certbot.jinja2 | 20 - template/Dockerfile/images/hhvm.jinja2 | 32 - template/Dockerfile/images/liquibase.jinja2 | 44 - template/Dockerfile/images/liquidsoap.jinja2 | 8 - .../Dockerfile/images/mail-sandbox.jinja2 | 24 - template/Dockerfile/images/nginx-dev.jinja2 | 3 - template/Dockerfile/images/php5-dev.jinja2 | 89 - template/Dockerfile/images/php5.jinja2 | 470 -- template/Dockerfile/images/php7-dev.jinja2 | 102 - template/Dockerfile/images/php7.jinja2 | 354 -- template/Dockerfile/images/piwik.jinja2 | 14 - template/Dockerfile/images/postfix.jinja2 | 7 - .../images/samson-deployment.jinja2 | 74 - template/Dockerfile/images/sphinx.jinja2 | 31 - template/Dockerfile/images/typo3-solr.jinja2 | 59 - template/Dockerfile/images/typo3.jinja2 | 12 - template/Dockerfile/images/varnish.jinja2 | 19 - template/Dockerfile/layout.jinja2 | 20 +- 4656 files changed, 482 insertions(+), 121533 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100644 ci/build-ci.php delete mode 100644 docker/ansible/README.md delete mode 100644 docker/ansible/alpine/Dockerfile delete mode 100644 docker/ansible/alpine/Dockerfile.jinja2 delete mode 100644 docker/ansible/centos-7/Dockerfile delete mode 100644 docker/ansible/centos-7/Dockerfile.jinja2 delete mode 100644 docker/ansible/debian-7/Dockerfile delete mode 100644 docker/ansible/debian-7/Dockerfile.jinja2 delete mode 100644 docker/ansible/debian-8/Dockerfile delete mode 100644 docker/ansible/debian-8/Dockerfile.jinja2 delete mode 100644 docker/ansible/debian-9/Dockerfile delete mode 100644 docker/ansible/debian-9/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-12.04/Dockerfile delete mode 100644 docker/ansible/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-14.04/Dockerfile delete mode 100644 docker/ansible/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-15.04/Dockerfile delete mode 100644 docker/ansible/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-15.10/Dockerfile delete mode 100644 docker/ansible/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-16.04/Dockerfile delete mode 100644 docker/ansible/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/ansible/ubuntu-17.04/Dockerfile delete mode 100644 docker/ansible/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/README.md delete mode 100644 docker/apache-dev/alpine/Dockerfile delete mode 100644 docker/apache-dev/alpine/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/centos-7/Dockerfile delete mode 100644 docker/apache-dev/centos-7/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/debian-10/Dockerfile delete mode 100644 docker/apache-dev/debian-10/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/debian-7/Dockerfile delete mode 100644 docker/apache-dev/debian-7/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/debian-8/Dockerfile delete mode 100644 docker/apache-dev/debian-8/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/debian-9/Dockerfile delete mode 100644 docker/apache-dev/debian-9/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-12.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-14.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-15.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-15.10/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-16.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-16.10/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-17.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-17.10/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache-dev/ubuntu-18.04/Dockerfile delete mode 100644 docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/apache/centos-7/Dockerfile delete mode 100644 docker/apache/centos-7/Dockerfile.jinja2 delete mode 100644 docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/centos-7/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/centos-7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/global.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/main.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/php.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/centos-7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/centos-7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/centos-7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/centos-7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/debian-10/Dockerfile delete mode 100644 docker/apache/debian-10/Dockerfile.jinja2 delete mode 100644 docker/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/debian-10/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/debian-10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/global.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/main.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/php.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/debian-10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/debian-10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/debian-10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/debian-10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/debian-7/Dockerfile delete mode 100644 docker/apache/debian-7/Dockerfile.jinja2 delete mode 100644 docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/debian-7/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/debian-7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/global.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/main.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/php.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/debian-7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/debian-7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/debian-7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/debian-7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/debian-8/Dockerfile delete mode 100644 docker/apache/debian-8/Dockerfile.jinja2 delete mode 100644 docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/debian-8/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/debian-8/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/global.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/main.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/php.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/debian-8/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/debian-8/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/debian-8/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/debian-8/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/debian-9/Dockerfile delete mode 100644 docker/apache/debian-9/Dockerfile.jinja2 delete mode 100644 docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/debian-9/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/debian-9/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/global.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/main.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/php.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/debian-9/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/debian-9/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/debian-9/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/debian-9/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-12.04/Dockerfile delete mode 100644 docker/apache/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-14.04/Dockerfile delete mode 100644 docker/apache/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-15.04/Dockerfile delete mode 100644 docker/apache/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-15.10/Dockerfile delete mode 100644 docker/apache/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-16.04/Dockerfile delete mode 100644 docker/apache/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-16.10/Dockerfile delete mode 100644 docker/apache/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-17.04/Dockerfile delete mode 100644 docker/apache/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-17.10/Dockerfile delete mode 100644 docker/apache/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/apache/ubuntu-18.04/Dockerfile delete mode 100644 docker/apache/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/global.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/main.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/php.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/base-app/centos-7/Dockerfile delete mode 100644 docker/base-app/centos-7/Dockerfile.jinja2 delete mode 100644 docker/base-app/debian-10/Dockerfile delete mode 100644 docker/base-app/debian-10/Dockerfile.jinja2 delete mode 100644 docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/debian-7/Dockerfile delete mode 100644 docker/base-app/debian-7/Dockerfile.jinja2 delete mode 100644 docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/debian-8/Dockerfile delete mode 100644 docker/base-app/debian-8/Dockerfile.jinja2 delete mode 100644 docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/debian-9/Dockerfile delete mode 100644 docker/base-app/debian-9/Dockerfile.jinja2 delete mode 100644 docker/base-app/debian-9/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-14.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-15.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-15.10/Dockerfile delete mode 100644 docker/base-app/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-16.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-16.10/Dockerfile delete mode 100644 docker/base-app/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-17.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-17.10/Dockerfile delete mode 100644 docker/base-app/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-18.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/base-app/ubuntu-20.04/Dockerfile delete mode 100644 docker/base-app/ubuntu-20.04/Dockerfile.jinja2 delete mode 100644 docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/20-app.sh rename docker/base-app/{ubuntu-12.04 => ubuntu-22.04}/Dockerfile (89%) rename docker/base-app/{ubuntu-12.04 => ubuntu-22.04}/Dockerfile.jinja2 (81%) rename docker/base-app/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/10-user-application.sh (100%) rename docker/base-app/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/20-app.sh (100%) delete mode 100644 docker/base/centos-7/Dockerfile delete mode 100644 docker/base/centos-7/Dockerfile.jinja2 delete mode 100644 docker/base/centos-7/conf/bin/service.d/cron.sh delete mode 100644 docker/base/centos-7/conf/etc/cron/.gitkeep delete mode 100644 docker/base/centos-7/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/roles/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/debian-10/Dockerfile delete mode 100644 docker/base/debian-10/Dockerfile.jinja2 delete mode 100644 docker/base/debian-10/conf/VERSION delete mode 100644 docker/base/debian-10/conf/bin/bootstrap.sh delete mode 100644 docker/base/debian-10/conf/bin/config.sh delete mode 100644 docker/base/debian-10/conf/bin/control.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/debian-10/conf/bin/entrypoint.sh delete mode 100755 docker/base/debian-10/conf/bin/provision delete mode 100755 docker/base/debian-10/conf/bin/provision.py delete mode 100644 docker/base/debian-10/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/debian-10/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/debian-10/conf/bin/usr-bin/service delete mode 100644 docker/base/debian-10/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/debian-10/conf/etc/cron/.gitkeep delete mode 100644 docker/base/debian-10/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/debian-10/conf/etc/supervisor.conf delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/debian-10/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/debian-10/conf/provision/ansible.cfg delete mode 100644 docker/base/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/debian-10/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/debian-10/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/roles/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/debian-10/conf/provision/service.d/cron.sh delete mode 100644 docker/base/debian-10/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-10/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/debian-10/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/debian-10/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-10/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-10/conf/provision/variables.yml delete mode 100644 docker/base/debian-7/Dockerfile delete mode 100644 docker/base/debian-7/Dockerfile.jinja2 delete mode 100644 docker/base/debian-7/conf/VERSION delete mode 100644 docker/base/debian-7/conf/bin/bootstrap.sh delete mode 100644 docker/base/debian-7/conf/bin/config.sh delete mode 100644 docker/base/debian-7/conf/bin/control.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/debian-7/conf/bin/entrypoint.sh delete mode 100755 docker/base/debian-7/conf/bin/provision delete mode 100755 docker/base/debian-7/conf/bin/provision.py delete mode 100644 docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/cron.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/debian-7/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/debian-7/conf/bin/usr-bin/service delete mode 100644 docker/base/debian-7/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/debian-7/conf/etc/cron/.gitkeep delete mode 100644 docker/base/debian-7/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/debian-7/conf/etc/supervisor.conf delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/debian-7/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/debian-7/conf/provision/ansible.cfg delete mode 100644 docker/base/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/debian-7/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/debian-7/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/roles/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/service.d/cron.sh delete mode 100644 docker/base/debian-7/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-7/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/debian-7/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/debian-7/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-7/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-7/conf/provision/variables.yml delete mode 100644 docker/base/debian-8/Dockerfile delete mode 100644 docker/base/debian-8/Dockerfile.jinja2 delete mode 100644 docker/base/debian-8/conf/VERSION delete mode 100644 docker/base/debian-8/conf/bin/bootstrap.sh delete mode 100644 docker/base/debian-8/conf/bin/config.sh delete mode 100644 docker/base/debian-8/conf/bin/control.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/debian-8/conf/bin/entrypoint.sh delete mode 100755 docker/base/debian-8/conf/bin/provision delete mode 100755 docker/base/debian-8/conf/bin/provision.py delete mode 100644 docker/base/debian-8/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/cron.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/debian-8/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/debian-8/conf/bin/usr-bin/service delete mode 100644 docker/base/debian-8/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/debian-8/conf/etc/cron/.gitkeep delete mode 100644 docker/base/debian-8/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/debian-8/conf/etc/supervisor.conf delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/debian-8/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/debian-8/conf/provision/ansible.cfg delete mode 100644 docker/base/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/debian-8/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/debian-8/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/roles/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/service.d/cron.sh delete mode 100644 docker/base/debian-8/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-8/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/debian-8/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/debian-8/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-8/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-8/conf/provision/variables.yml delete mode 100644 docker/base/debian-9/Dockerfile delete mode 100644 docker/base/debian-9/Dockerfile.jinja2 delete mode 100644 docker/base/debian-9/conf/VERSION delete mode 100644 docker/base/debian-9/conf/bin/bootstrap.sh delete mode 100644 docker/base/debian-9/conf/bin/config.sh delete mode 100644 docker/base/debian-9/conf/bin/control.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/debian-9/conf/bin/entrypoint.sh delete mode 100755 docker/base/debian-9/conf/bin/provision delete mode 100755 docker/base/debian-9/conf/bin/provision.py delete mode 100644 docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/cron.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/debian-9/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/debian-9/conf/bin/usr-bin/service delete mode 100644 docker/base/debian-9/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/debian-9/conf/etc/cron/.gitkeep delete mode 100644 docker/base/debian-9/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/debian-9/conf/etc/supervisor.conf delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/debian-9/conf/provision/ansible.cfg delete mode 100644 docker/base/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/debian-9/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/debian-9/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/roles/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/service.d/cron.sh delete mode 100644 docker/base/debian-9/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/debian-9/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/debian-9/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/debian-9/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-9/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-9/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-12.04/conf/VERSION delete mode 100644 docker/base/ubuntu-12.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-12.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-12.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-12.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-12.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-12.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-12.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-14.04/Dockerfile delete mode 100644 docker/base/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-14.04/conf/VERSION delete mode 100644 docker/base/ubuntu-14.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-14.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-14.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-14.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-14.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-14.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-14.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-15.04/Dockerfile delete mode 100644 docker/base/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-15.04/conf/VERSION delete mode 100644 docker/base/ubuntu-15.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-15.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-15.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-15.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-15.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-15.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-15.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-15.10/Dockerfile delete mode 100644 docker/base/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-15.10/conf/VERSION delete mode 100644 docker/base/ubuntu-15.10/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-15.10/conf/bin/provision delete mode 100755 docker/base/ubuntu-15.10/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-15.10/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-15.10/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-15.10/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-15.10/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-16.04/Dockerfile delete mode 100644 docker/base/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-16.04/conf/VERSION delete mode 100644 docker/base/ubuntu-16.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-16.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-16.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-16.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-16.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-16.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-16.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-16.10/Dockerfile delete mode 100644 docker/base/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-16.10/conf/VERSION delete mode 100644 docker/base/ubuntu-16.10/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-16.10/conf/bin/provision delete mode 100755 docker/base/ubuntu-16.10/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-16.10/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-16.10/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-16.10/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-16.10/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-16.10/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-17.04/Dockerfile delete mode 100644 docker/base/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-17.04/conf/VERSION delete mode 100644 docker/base/ubuntu-17.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-17.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-17.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-17.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-17.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-17.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-17.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-17.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-17.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-17.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-17.10/Dockerfile delete mode 100644 docker/base/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-17.10/conf/VERSION delete mode 100644 docker/base/ubuntu-17.10/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-17.10/conf/bin/provision delete mode 100755 docker/base/ubuntu-17.10/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-17.10/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-17.10/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-17.10/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-17.10/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-17.10/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-17.10/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-17.10/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-18.04/Dockerfile delete mode 100644 docker/base/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-18.04/conf/VERSION delete mode 100644 docker/base/ubuntu-18.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-18.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-18.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-18.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-18.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-18.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-18.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-18.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-18.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-18.04/conf/provision/variables.yml delete mode 100644 docker/base/ubuntu-20.04/Dockerfile delete mode 100644 docker/base/ubuntu-20.04/Dockerfile.jinja2 delete mode 100644 docker/base/ubuntu-20.04/conf/VERSION delete mode 100644 docker/base/ubuntu-20.04/conf/bin/bootstrap.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/config.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/control.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/entrypoint.sh delete mode 100755 docker/base/ubuntu-20.04/conf/bin/provision delete mode 100755 docker/base/ubuntu-20.04/conf/bin/provision.py delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/cron.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/base/ubuntu-20.04/conf/bin/usr-bin/service delete mode 100644 docker/base/ubuntu-20.04/conf/bin/usr-bin/version-compare delete mode 100644 docker/base/ubuntu-20.04/conf/etc/cron/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/base/ubuntu-20.04/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/base/ubuntu-20.04/conf/provision/ansible.cfg delete mode 100644 docker/base/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/build.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/roles/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/.gitkeep delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/cron.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/postfix.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/ssh.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-20.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-20.04/conf/provision/variables.yml rename docker/base/{ubuntu-12.04 => ubuntu-22.04}/Dockerfile (86%) rename docker/base/{ubuntu-12.04 => ubuntu-22.04}/Dockerfile.jinja2 (83%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/VERSION (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/bootstrap.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/config.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/control.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.d/cli.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.d/default.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.d/noop.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.d/root.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/entrypoint.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/provision (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/provision.py (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/base/{debian-10 => ubuntu-22.04}/conf/bin/service.d/cron.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/dnsmasq.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/postfix.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/ssh.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/supervisor.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/service.d/syslog-ng.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/container-file-auto-restore (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-ansible-install (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-cronjob (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-provision (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-service (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-service-disable (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/docker-service-enable (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/service (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/bin/usr-bin/version-compare (100%) rename docker/{apache-dev/alpine/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/etc/cron}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/logrotate.d/syslog-ng (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.conf (100%) rename docker/{apache-dev/centos-7/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/etc/supervisor.d}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.d/cron.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.d/postfix.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.d/ssh.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/supervisor.d/syslog.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/ansible.cfg (100%) rename docker/{apache-dev/debian-10/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/bootstrap.d}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/10-entrypoint.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/10-permissions.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/10-supervisor.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/bootstrap.d/90-cleanup.sh (100%) rename docker/{apache-dev/debian-7/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/build.d}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/build.d/10-cleanup.sh (100%) rename docker/{apache-dev/debian-8/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/entrypoint.d}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/{apache-dev/debian-9/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/onbuild.d}/.gitkeep (100%) rename docker/{apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/roles}/.gitkeep (100%) rename docker/{apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d => base/ubuntu-22.04/conf/provision/service.d}/.gitkeep (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/service.d/cron.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/service.d/dnsmasq.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/service.d/postfix.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/service.d/ssh.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/service.d/syslog.sh (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/variables-webdevops.yml (100%) rename docker/base/{centos-7 => ubuntu-22.04}/conf/provision/variables.yml (100%) delete mode 100644 docker/bootstrap/centos-7/Dockerfile delete mode 100644 docker/bootstrap/centos-7/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/debian-10/Dockerfile delete mode 100644 docker/bootstrap/debian-10/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/debian-7/Dockerfile delete mode 100644 docker/bootstrap/debian-7/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/debian-8/Dockerfile delete mode 100644 docker/bootstrap/debian-8/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/debian-9/Dockerfile delete mode 100644 docker/bootstrap/debian-9/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-12.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-15.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-15.10/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-16.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-16.10/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-17.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-17.10/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-18.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/bootstrap/ubuntu-20.04/Dockerfile delete mode 100644 docker/bootstrap/ubuntu-20.04/Dockerfile.jinja2 rename docker/bootstrap/{ubuntu-14.04 => ubuntu-22.04}/Dockerfile (92%) rename docker/bootstrap/{ubuntu-16.04 => ubuntu-22.04}/Dockerfile.jinja2 (80%) delete mode 100644 docker/certbot/README.md delete mode 100644 docker/certbot/latest/Dockerfile delete mode 100644 docker/certbot/latest/Dockerfile.jinja2 delete mode 100644 docker/liquibase/latest/Dockerfile delete mode 100644 docker/liquibase/latest/Dockerfile.jinja2 delete mode 100644 docker/liquibase/latest/conf/bin/entrypoint.sh delete mode 100644 docker/liquibase/mysql/Dockerfile delete mode 100644 docker/liquibase/mysql/Dockerfile.jinja2 delete mode 100644 docker/liquibase/mysql/conf/bin/entrypoint.sh delete mode 100644 docker/liquibase/postgres/Dockerfile delete mode 100644 docker/liquibase/postgres/Dockerfile.jinja2 delete mode 100644 docker/liquibase/postgres/conf/bin/entrypoint.sh delete mode 100644 docker/liquidsoap/latest/Dockerfile delete mode 100644 docker/liquidsoap/latest/Dockerfile.jinja2 delete mode 100644 docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh delete mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq delete mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 delete mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-day.pls delete mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-night.pls delete mode 100644 docker/mail-sandbox/README.md delete mode 100644 docker/mail-sandbox/latest/Dockerfile delete mode 100644 docker/mail-sandbox/latest/Dockerfile.jinja2 delete mode 100644 docker/mail-sandbox/latest/conf/bin/service.d/dovecot.d/10-init.sh delete mode 100644 docker/mail-sandbox/latest/conf/bin/service.d/dovecot.sh delete mode 100644 docker/mail-sandbox/latest/conf/etc/dovecot/local.conf delete mode 100644 docker/mail-sandbox/latest/conf/etc/roundcube/config.php delete mode 100644 docker/mail-sandbox/latest/conf/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php delete mode 100644 docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf delete mode 100644 docker/mail-sandbox/latest/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-dovecot.sh delete mode 100644 docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-postfix.sh delete mode 100644 docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-mail-sandbox.sh delete mode 100644 docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-postfix.sh delete mode 100644 docker/nginx-dev/README.md delete mode 100644 docker/nginx-dev/alpine/Dockerfile delete mode 100644 docker/nginx-dev/alpine/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/centos-7/Dockerfile delete mode 100644 docker/nginx-dev/centos-7/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/debian-10/Dockerfile delete mode 100644 docker/nginx-dev/debian-10/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/debian-7/Dockerfile delete mode 100644 docker/nginx-dev/debian-7/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/debian-8/Dockerfile delete mode 100644 docker/nginx-dev/debian-8/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/debian-9/Dockerfile delete mode 100644 docker/nginx-dev/debian-9/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-12.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-14.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-15.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-15.10/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-16.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-16.10/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-17.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-17.10/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx-dev/ubuntu-18.04/Dockerfile delete mode 100644 docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/nginx/centos-7/Dockerfile delete mode 100644 docker/nginx/centos-7/Dockerfile.jinja2 delete mode 100644 docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/centos-7/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/nginx.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/centos-7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/debian-10/Dockerfile delete mode 100644 docker/nginx/debian-10/Dockerfile.jinja2 delete mode 100644 docker/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/debian-10/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/debian-10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/debian-10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/debian-7/Dockerfile delete mode 100644 docker/nginx/debian-7/Dockerfile.jinja2 delete mode 100644 docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/debian-7/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/debian-7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/debian-8/Dockerfile delete mode 100644 docker/nginx/debian-8/Dockerfile.jinja2 delete mode 100644 docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/debian-8/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/debian-8/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/debian-9/Dockerfile delete mode 100644 docker/nginx/debian-9/Dockerfile.jinja2 delete mode 100644 docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/debian-9/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/debian-9/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-12.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-14.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-15.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-15.10/Dockerfile delete mode 100644 docker/nginx/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-16.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-16.10/Dockerfile delete mode 100644 docker/nginx/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-17.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-17.10/Dockerfile delete mode 100644 docker/nginx/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/nginx/ubuntu-18.04/Dockerfile delete mode 100644 docker/nginx/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/global.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/main.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/php.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/Dockerfile delete mode 100644 docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/Dockerfile delete mode 100644 docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/centos-7/Dockerfile delete mode 100644 docker/php-apache-dev/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/debian-10/Dockerfile delete mode 100644 docker/php-apache-dev/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/debian-7/Dockerfile delete mode 100644 docker/php-apache-dev/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/Dockerfile delete mode 100644 docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/debian-8/Dockerfile delete mode 100644 docker/php-apache-dev/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/debian-9/Dockerfile delete mode 100644 docker/php-apache-dev/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/Dockerfile delete mode 100644 docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache/centos-7-php56/Dockerfile delete mode 100644 docker/php-apache/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/centos-7-php7/Dockerfile delete mode 100644 docker/php-apache/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/centos-7/Dockerfile delete mode 100644 docker/php-apache/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/centos-7/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/centos-7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/centos-7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/centos-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/centos-7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/debian-10/Dockerfile delete mode 100644 docker/php-apache/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php-apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/debian-10/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/debian-10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/debian-10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/debian-10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/debian-10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/debian-7/Dockerfile delete mode 100644 docker/php-apache/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/debian-7/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/debian-7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/debian-7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/debian-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/debian-7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/debian-8-php7/Dockerfile delete mode 100644 docker/php-apache/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/debian-8/Dockerfile delete mode 100644 docker/php-apache/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/debian-8/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/debian-8/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/debian-8/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/debian-8/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/debian-8/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/debian-9/Dockerfile delete mode 100644 docker/php-apache/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/debian-9/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/debian-9/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/debian-9/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/debian-9/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/debian-9/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-12.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-14.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-15.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-15.10/Dockerfile delete mode 100644 docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-16.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-16.10/Dockerfile delete mode 100644 docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-17.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-17.10/Dockerfile delete mode 100644 docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/ubuntu-18.04/Dockerfile delete mode 100644 docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh delete mode 120000 docker/php-dev/alpine delete mode 120000 docker/php-dev/alpine-3 delete mode 120000 docker/php-dev/alpine-3-php7 delete mode 100644 docker/php-dev/centos-7-php56/Dockerfile delete mode 100644 docker/php-dev/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/centos-7-php7/Dockerfile delete mode 100644 docker/php-dev/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/centos-7/Dockerfile delete mode 100644 docker/php-dev/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/centos-7/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/centos-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/centos-7/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/debian-10/Dockerfile delete mode 100644 docker/php-dev/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/debian-10/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/debian-10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/debian-10/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/debian-7/Dockerfile delete mode 100644 docker/php-dev/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/debian-7/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/debian-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/debian-7/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/debian-8-php7/Dockerfile delete mode 100644 docker/php-dev/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/debian-8/Dockerfile delete mode 100644 docker/php-dev/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/debian-8/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/debian-8/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/debian-8/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/debian-9/Dockerfile delete mode 100644 docker/php-dev/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/debian-9/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/debian-9/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/debian-9/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-12.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-14.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-15.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-15.10/Dockerfile delete mode 100644 docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-16.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-16.10/Dockerfile delete mode 100644 docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-17.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-17.10/Dockerfile delete mode 100644 docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/ubuntu-18.04/Dockerfile delete mode 100644 docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 120000 docker/php-nginx-dev/alpine delete mode 120000 docker/php-nginx-dev/alpine-3 delete mode 120000 docker/php-nginx-dev/alpine-3-php7 delete mode 100644 docker/php-nginx-dev/centos-7-php56/Dockerfile delete mode 100644 docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/Dockerfile delete mode 100644 docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/centos-7/Dockerfile delete mode 100644 docker/php-nginx-dev/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/debian-10/Dockerfile delete mode 100644 docker/php-nginx-dev/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/debian-7/Dockerfile delete mode 100644 docker/php-nginx-dev/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/Dockerfile delete mode 100644 docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/debian-8/Dockerfile delete mode 100644 docker/php-nginx-dev/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/debian-9/Dockerfile delete mode 100644 docker/php-nginx-dev/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/Dockerfile delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 120000 docker/php-nginx/alpine delete mode 120000 docker/php-nginx/alpine-3 delete mode 120000 docker/php-nginx/alpine-3-php7 delete mode 100644 docker/php-nginx/centos-7-php56/Dockerfile delete mode 100644 docker/php-nginx/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/centos-7-php7/Dockerfile delete mode 100644 docker/php-nginx/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/centos-7/Dockerfile delete mode 100644 docker/php-nginx/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/centos-7/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/centos-7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/centos-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/debian-10/Dockerfile delete mode 100644 docker/php-nginx/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/debian-10/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/debian-10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/debian-10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/debian-7/Dockerfile delete mode 100644 docker/php-nginx/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/debian-7/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/debian-7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/debian-7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/debian-8-php7/Dockerfile delete mode 100644 docker/php-nginx/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/debian-8/Dockerfile delete mode 100644 docker/php-nginx/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/debian-8/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/debian-8/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/debian-8/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/debian-9/Dockerfile delete mode 100644 docker/php-nginx/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/debian-9/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/debian-9/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/debian-9/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-12.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-14.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.10/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.10/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.10/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-18.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-20.04/Dockerfile delete mode 100644 docker/php-nginx/ubuntu-20.04/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/20-nginx.sh delete mode 120000 docker/php/alpine delete mode 100644 docker/php/centos-7-php56/Dockerfile delete mode 100644 docker/php/centos-7-php56/Dockerfile.jinja2 delete mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/centos-7-php56/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/centos-7-php56/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/centos-7-php56/conf/etc/php/php.ini delete mode 100644 docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/centos-7-php7/Dockerfile delete mode 100644 docker/php/centos-7-php7/Dockerfile.jinja2 delete mode 100644 docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/centos-7-php7/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/centos-7-php7/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/centos-7-php7/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/centos-7-php7/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/centos-7-php7/conf/etc/php/php.ini delete mode 100644 docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/centos-7-php7/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/centos-7/Dockerfile delete mode 100644 docker/php/centos-7/Dockerfile.jinja2 delete mode 100644 docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/centos-7/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/centos-7/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/centos-7/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/centos-7/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/centos-7/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/centos-7/conf/etc/php/php.ini delete mode 100644 docker/php/centos-7/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/centos-7/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/centos-7/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/centos-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/centos-7/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/debian-10/Dockerfile delete mode 100644 docker/php/debian-10/Dockerfile.jinja2 delete mode 100644 docker/php/debian-10/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/debian-10/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/debian-10/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/debian-10/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/debian-10/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/debian-10/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/debian-10/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/debian-10/conf/etc/php/php.ini delete mode 100644 docker/php/debian-10/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/debian-10/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/debian-10/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/debian-10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/debian-10/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/debian-7/Dockerfile delete mode 100644 docker/php/debian-7/Dockerfile.jinja2 delete mode 100644 docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/debian-7/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/debian-7/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/debian-7/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/debian-7/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/debian-7/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/debian-7/conf/etc/php/php.ini delete mode 100644 docker/php/debian-7/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/debian-7/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/debian-7/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/debian-7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/debian-7/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/debian-8-php7/Dockerfile delete mode 100644 docker/php/debian-8-php7/Dockerfile.jinja2 delete mode 100644 docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/debian-8-php7/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/debian-8-php7/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/debian-8-php7/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/debian-8-php7/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/debian-8-php7/conf/etc/php/php.ini delete mode 100644 docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/debian-8-php7/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/debian-8/Dockerfile delete mode 100644 docker/php/debian-8/Dockerfile.jinja2 delete mode 100644 docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/debian-8/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/debian-8/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/debian-8/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/debian-8/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/debian-8/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/debian-8/conf/etc/php/php.ini delete mode 100644 docker/php/debian-8/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/debian-8/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/debian-8/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/debian-8/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/debian-8/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/debian-9/Dockerfile delete mode 100644 docker/php/debian-9/Dockerfile.jinja2 delete mode 100644 docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/debian-9/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/debian-9/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/debian-9/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/debian-9/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/debian-9/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/debian-9/conf/etc/php/php.ini delete mode 100644 docker/php/debian-9/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/debian-9/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/debian-9/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/debian-9/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/debian-9/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-12.04/Dockerfile delete mode 100644 docker/php/ubuntu-12.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-12.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-12.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-12.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-12.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-12.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-12.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-14.04/Dockerfile delete mode 100644 docker/php/ubuntu-14.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-14.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-14.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-14.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-14.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-14.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-14.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-15.04/Dockerfile delete mode 100644 docker/php/ubuntu-15.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-15.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-15.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-15.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-15.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-15.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-15.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-15.10/Dockerfile delete mode 100644 docker/php/ubuntu-15.10/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-15.10/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-15.10/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-15.10/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-15.10/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-15.10/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-15.10/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-16.04/Dockerfile delete mode 100644 docker/php/ubuntu-16.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-16.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-16.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-16.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-16.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-16.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-16.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-16.10/Dockerfile delete mode 100644 docker/php/ubuntu-16.10/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-16.10/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-16.10/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-16.10/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-16.10/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-16.10/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-16.10/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-17.04/Dockerfile delete mode 100644 docker/php/ubuntu-17.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-17.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-17.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-17.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-17.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-17.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-17.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-17.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-17.10/Dockerfile delete mode 100644 docker/php/ubuntu-17.10/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-17.10/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-17.10/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-17.10/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-17.10/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-17.10/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-17.10/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-17.10/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-18.04/Dockerfile delete mode 100644 docker/php/ubuntu-18.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-18.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-18.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-18.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-18.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-18.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-18.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-18.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php/ubuntu-20.04/Dockerfile delete mode 100644 docker/php/ubuntu-20.04/Dockerfile.jinja2 delete mode 100644 docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php/ubuntu-20.04/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php/ubuntu-20.04/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php/ubuntu-20.04/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php/ubuntu-20.04/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php/ubuntu-20.04/conf/etc/php/php.ini delete mode 100644 docker/php/ubuntu-20.04/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php/ubuntu-20.04/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/piwik/README.md delete mode 100644 docker/piwik/latest/Dockerfile delete mode 100644 docker/piwik/latest/Dockerfile.jinja2 delete mode 100644 docker/piwik/latest/conf/bin/piwik-cron.sh delete mode 100644 docker/piwik/latest/conf/bin/piwik-env.sh delete mode 100644 docker/piwik/latest/conf/etc/cron/crontab delete mode 100644 docker/piwik/latest/conf/etc/php/php.ini delete mode 100644 docker/piwik/latest/conf/provision/entrypoint.d/10-piwik-env.sh delete mode 100644 docker/postfix/README.md delete mode 100644 docker/postfix/latest/Dockerfile delete mode 100644 docker/postfix/latest/Dockerfile.jinja2 delete mode 100644 docker/postfix/latest/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/samson-deployment/README.md delete mode 100644 docker/samson-deployment/latest/Dockerfile delete mode 100644 docker/samson-deployment/latest/Dockerfile.jinja2 delete mode 100644 docker/samson-deployment/latest/conf/VERSION delete mode 100644 docker/samson-deployment/latest/conf/bin/bootstrap.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/config.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/control.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/entrypoint.sh delete mode 100755 docker/samson-deployment/latest/conf/bin/provision delete mode 100755 docker/samson-deployment/latest/conf/bin/provision.py delete mode 100644 docker/samson-deployment/latest/conf/bin/samson-cleanup-db.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/cron.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/nginx.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/postfix.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/samson.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/samson.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/ssh.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/supervisor.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-service delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/samson-deployment/latest/conf/bin/usr-bin/service delete mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/version-compare delete mode 100644 docker/samson-deployment/latest/conf/etc/cron/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/samson-deployment/latest/conf/etc/nginx/vhost.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/docker.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/samson.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/samson-deployment/latest/conf/provision/ansible.cfg delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/build.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/defaults/main.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/main.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/cron.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/postfix.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/ssh.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/service.d/syslog.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/variables-webdevops.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/variables.yml delete mode 100644 docker/samson-deployment/latest/crontab delete mode 100644 docker/samson-deployment/latest/database.yml delete mode 100644 docker/samson-deployment/latest/web/502.html delete mode 100644 docker/samson-deployment/latest/web/logo_light.png delete mode 100644 docker/sphinx/latest/Dockerfile delete mode 100644 docker/sphinx/latest/Dockerfile.jinja2 delete mode 100644 docker/sphinx/latest/README.md delete mode 100644 docker/typo3-solr/3.1/Dockerfile delete mode 100644 docker/typo3-solr/3.1/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/3.1/solr/solr.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/admin-extra.html delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/basque/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/basque/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/basque/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/readme.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/currency.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/czech/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/czech/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/czech/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/danish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/danish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/danish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/elevate.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/english/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/english/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/english/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/french/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/french/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/french/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/galician/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/galician/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/galician/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_fields.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_types.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/generic/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/generic/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/generic/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/german/german-common-nouns.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/german/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/german/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/german/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/greek/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/greek/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/greek/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/italian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/italian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/italian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/readme.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/korean/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/korean/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/korean/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/lao/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/lao/readme.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/lao/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/lao/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/persian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/persian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/persian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/polish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/polish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/polish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/russian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/russian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/russian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/solrconfig.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/thai/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/thai/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/thai/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/protwords.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/schema.xml delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/synonyms.txt delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/VM_global_library.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/browse.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/doc.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facet_fields.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facets.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/footer.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/head.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/header.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hit.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hitGrouped.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.css delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.js delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/layout.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/main.css delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/query.vm delete mode 100644 docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/suggest.vm delete mode 120000 docker/typo3-solr/4.0 delete mode 100644 docker/typo3-solr/5.0/Dockerfile delete mode 100644 docker/typo3-solr/5.0/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/5.0/solr/solr.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/admin-extra.html delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/basque/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/basque/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/basque/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/readme.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/currency.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/czech/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/czech/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/czech/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/danish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/danish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/danish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/elevate.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/english/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/english/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/english/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/french/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/french/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/french/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/galician/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/galician/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/galician/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_fields.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_types.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/generic/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/generic/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/generic/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/german/german-common-nouns.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/german/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/german/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/german/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/greek/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/greek/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/greek/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/italian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/italian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/italian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/readme.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/korean/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/korean/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/korean/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/lao/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/lao/readme.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/lao/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/lao/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/persian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/persian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/persian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/polish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/polish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/polish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/russian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/russian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/russian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/solrconfig.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/thai/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/thai/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/thai/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/protwords.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/schema.xml delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/synonyms.txt delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/VM_global_library.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/browse.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/doc.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facet_fields.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facets.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/footer.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/head.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/header.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hit.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hitGrouped.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.css delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.js delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/layout.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/main.css delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/query.vm delete mode 100644 docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/suggest.vm delete mode 100644 docker/typo3-solr/6.0/Dockerfile delete mode 100644 docker/typo3-solr/6.0/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/6.1/Dockerfile delete mode 100644 docker/typo3-solr/6.1/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/6.5/Dockerfile delete mode 100644 docker/typo3-solr/6.5/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/7.0/Dockerfile delete mode 100644 docker/typo3-solr/7.0/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/7.5/Dockerfile delete mode 100644 docker/typo3-solr/7.5/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/8.0/Dockerfile delete mode 100644 docker/typo3-solr/8.0/Dockerfile.jinja2 delete mode 100644 docker/typo3-solr/8.1/Dockerfile delete mode 100644 docker/typo3-solr/8.1/Dockerfile.jinja2 delete mode 120000 docker/typo3-solr/latest delete mode 100644 docker/varnish/README.md delete mode 100644 docker/varnish/latest/Dockerfile delete mode 100644 docker/varnish/latest/Dockerfile.jinja2 delete mode 100644 docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh delete mode 100644 docker/varnish/latest/conf/etc/varnish/varnish.vcl delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/ansible.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/certbot.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/hhvm.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/liquibase.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/postfix.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/sphinx.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst delete mode 100644 documentation/docs/content/DockerImages/dockerfiles/varnish.rst delete mode 100644 provisioning/hhvm-apache/general/etc/httpd/conf.d/.gitkeep delete mode 100644 provisioning/hhvm-apache/general/etc/httpd/conf.d/10-php.conf delete mode 100644 provisioning/hhvm-apache/general/provision/bootstrap.d/10-hhvm.sh delete mode 100644 provisioning/hhvm-nginx/general/etc/nginx/conf.d/.gitkeep delete mode 100644 provisioning/hhvm-nginx/general/etc/nginx/conf.d/10-php.conf delete mode 100644 provisioning/hhvm-nginx/general/provision/bootstrap.d/10-hhvm.sh delete mode 100644 provisioning/hhvm/general/bin/service.d/hhvm.d/10-init.sh delete mode 100644 provisioning/hhvm/general/bin/service.d/hhvm.sh delete mode 100644 provisioning/hhvm/general/etc/supervisor.d/hhvm.conf delete mode 100644 provisioning/hhvm/general/provision/bootstrap.d/10-hhvm.sh delete mode 100644 provisioning/liquibase/general/bin/entrypoint.sh delete mode 100644 provisioning/mail-sandbox/general/bin/service.d/dovecot.d/10-init.sh delete mode 100644 provisioning/mail-sandbox/general/bin/service.d/dovecot.sh delete mode 100644 provisioning/mail-sandbox/general/etc/dovecot/local.conf delete mode 100644 provisioning/mail-sandbox/general/etc/roundcube/config.php delete mode 100644 provisioning/mail-sandbox/general/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php delete mode 100644 provisioning/mail-sandbox/general/etc/supervisor.d/dovecot.conf delete mode 100644 provisioning/mail-sandbox/general/provision/bootstrap.d/.gitkeep delete mode 100644 provisioning/mail-sandbox/general/provision/bootstrap.d/20-dovecot.sh delete mode 100644 provisioning/mail-sandbox/general/provision/bootstrap.d/20-postfix.sh delete mode 100644 provisioning/mail-sandbox/general/provision/entrypoint.d/20-mail-sandbox.sh delete mode 100644 provisioning/mail-sandbox/general/provision/entrypoint.d/20-postfix.sh delete mode 100644 provisioning/piwik/general/bin/piwik-cron.sh delete mode 100644 provisioning/piwik/general/bin/piwik-env.sh delete mode 100644 provisioning/piwik/general/etc/cron/crontab delete mode 100644 provisioning/piwik/general/etc/php/php.ini delete mode 100644 provisioning/piwik/general/provision/entrypoint.d/10-piwik-env.sh delete mode 100644 provisioning/postfix/general/provision/bootstrap.d/.gitkeep delete mode 100644 provisioning/samson-deployment/general/bin/samson-cleanup-db.sh delete mode 100644 provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh delete mode 100644 provisioning/samson-deployment/general/bin/service.d/nginx.sh delete mode 100644 provisioning/samson-deployment/general/bin/service.d/samson.d/10-init.sh delete mode 100644 provisioning/samson-deployment/general/bin/service.d/samson.sh delete mode 100644 provisioning/samson-deployment/general/etc/nginx/vhost.conf delete mode 100644 provisioning/samson-deployment/general/etc/supervisor.d/docker.conf delete mode 100644 provisioning/samson-deployment/general/etc/supervisor.d/nginx.conf delete mode 100644 provisioning/samson-deployment/general/etc/supervisor.d/samson.conf delete mode 100644 provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/defaults/main.yml delete mode 100644 provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml delete mode 100644 provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml delete mode 100644 provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/main.yml delete mode 100644 provisioning/typo3/general/provision/bootstrap.d/.gitkeep delete mode 100644 provisioning/varnish/general/bin/entrypoint.d/varnishd.sh delete mode 100644 provisioning/varnish/general/etc/varnish/varnish.vcl delete mode 100644 sandbox/Dockerfile delete mode 100644 sandbox/code/index.php delete mode 100644 sandbox/docker-compose.yml delete mode 100644 template/Dockerfile/images/ansible.jinja2 delete mode 100644 template/Dockerfile/images/apache-dev.jinja2 delete mode 100644 template/Dockerfile/images/certbot.jinja2 delete mode 100644 template/Dockerfile/images/hhvm.jinja2 delete mode 100644 template/Dockerfile/images/liquibase.jinja2 delete mode 100644 template/Dockerfile/images/liquidsoap.jinja2 delete mode 100644 template/Dockerfile/images/mail-sandbox.jinja2 delete mode 100644 template/Dockerfile/images/nginx-dev.jinja2 delete mode 100644 template/Dockerfile/images/php5-dev.jinja2 delete mode 100644 template/Dockerfile/images/php5.jinja2 delete mode 100644 template/Dockerfile/images/php7-dev.jinja2 delete mode 100644 template/Dockerfile/images/php7.jinja2 delete mode 100644 template/Dockerfile/images/piwik.jinja2 delete mode 100644 template/Dockerfile/images/postfix.jinja2 delete mode 100644 template/Dockerfile/images/samson-deployment.jinja2 delete mode 100644 template/Dockerfile/images/sphinx.jinja2 delete mode 100644 template/Dockerfile/images/typo3-solr.jinja2 delete mode 100644 template/Dockerfile/images/typo3.jinja2 delete mode 100644 template/Dockerfile/images/varnish.jinja2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c9310592..0a30d1317 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,6 @@ stages: - level3 - level4 - level5 - - level6 - - level7 'webdevops/toolbox:latest': stage: level1 before_script: @@ -40,7 +38,7 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/bootstrap:alpine': +'webdevops/bootstrap:ubuntu-22.04': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -49,50 +47,25 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/bootstrap/alpine' - - 'docker build --no-cache -t webdevops/bootstrap:alpine .' + - 'cd docker/bootstrap/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_63973bcba23bb9.02658083' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba23bb9.02658083' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba23bb9.02658083' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba23bb9.02658083' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_63985166074c46.77379969' + - 'echo "COPY conf/ /" >> Dockerfile_63985166074c46.77379969' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTIzYmI5LjAyNjU4MDgzIn0= Dockerfile_63973bcba23bb9.02658083' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzRjNDYuNzczNzk5NjkifQ== Dockerfile_63985166074c46.77379969' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - - 'docker push webdevops/bootstrap:alpine' - - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' + - 'docker push webdevops/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' + - 'docker push webdevops/bootstrap:latest' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/certbot:latest': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/certbot/latest' - - 'docker build --no-cache -t webdevops/certbot:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/certbot:latest" >> Dockerfile_63973bcba23fa7.06095486' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba23fa7.06095486' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba23fa7.06095486' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba23fa7.06095486' - - 'bundle install' - - 'bash serverspec.sh spec/docker/certbot_spec.rb webdevops/certbot:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2NlcnRib3Q6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjEiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyM2ZhNy4wNjA5NTQ4NiJ9 Dockerfile_63973bcba23fa7.06095486' - - 'docker push webdevops/certbot:latest' - - 'docker tag webdevops/certbot:latest $CI_REGISTRY_IMAGE/certbot:latest' - - 'docker push $CI_REGISTRY_IMAGE/certbot:latest' - tags: - - aws - needs: - - 'webdevops/bootstrap:alpine' -'webdevops/base:alpine': +'webdevops/base:ubuntu-22.04': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -101,23 +74,25 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/base/alpine' - - 'docker build --no-cache -t webdevops/base:alpine .' + - 'cd docker/base/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_63973bcba24399.55995570' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24399.55995570' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_63985166074e52.09117090' + - 'echo "COPY conf/ /" >> Dockerfile_63985166074e52.09117090' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNDM5OS41NTk5NTU3MCJ9 Dockerfile_63973bcba24399.55995570' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc0ZTUyLjA5MTE3MDkwIn0= Dockerfile_63985166074e52.09117090' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - - 'docker push webdevops/base:alpine' - - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' + - 'docker push webdevops/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' + - 'docker push webdevops/base:latest' tags: - aws needs: - - 'webdevops/bootstrap:alpine' -'webdevops/base-app:alpine': + - 'webdevops/bootstrap:ubuntu-22.04' +'webdevops/base-app:ubuntu-22.04': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -126,46 +101,25 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/base-app/alpine' - - 'docker build --no-cache -t webdevops/base-app:alpine .' + - 'cd docker/base-app/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63973bcba245a1.64825325' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba245a1.64825325' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_63985166074ff4.54511951' + - 'echo "COPY conf/ /" >> Dockerfile_63985166074ff4.54511951' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjQ1YTEuNjQ4MjUzMjUifQ== Dockerfile_63973bcba245a1.64825325' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NGZmNC41NDUxMTk1MSJ9 Dockerfile_63985166074ff4.54511951' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - - 'docker push webdevops/base-app:alpine' - - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' - tags: - - aws - needs: - - 'webdevops/base:alpine' -'webdevops/nginx:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/nginx/alpine' - - 'docker build --no-cache -t webdevops/nginx:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_63973bcba247b9.88455226' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba247b9.88455226' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjQ3YjkuODg0NTUyMjYifQ== Dockerfile_63973bcba247b9.88455226' - - 'docker push webdevops/nginx:alpine' - - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' + - 'docker push webdevops/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' + - 'docker push webdevops/base-app:latest' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/nginx-dev:alpine': + - 'webdevops/base:ubuntu-22.04' +'webdevops/dockerfile-build-env:latest': stage: level5 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -174,44 +128,16 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/nginx-dev/alpine' - - 'docker build --no-cache -t webdevops/nginx-dev:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx-dev:alpine" >> Dockerfile_63973bcba249c3.11013734' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba249c3.11013734' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx-dev_spec.rb webdevops/nginx-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54LWRldjphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI0OWMzLjExMDEzNzM0In0= Dockerfile_63973bcba249c3.11013734' - - 'docker push webdevops/nginx-dev:alpine' - - 'docker tag webdevops/nginx-dev:alpine $CI_REGISTRY_IMAGE/nginx-dev:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx-dev:alpine' - tags: - - aws - needs: - - 'webdevops/nginx:alpine' -'webdevops/apache:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/apache/alpine' - - 'docker build --no-cache -t webdevops/apache:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_63973bcba24bb1.19606717' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24bb1.19606717' - - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI0YmIxLjE5NjA2NzE3In0= Dockerfile_63973bcba24bb1.19606717' - - 'docker push webdevops/apache:alpine' - - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' + - 'cd docker/dockerfile-build-env/latest' + - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' + - 'docker push webdevops/dockerfile-build-env:latest' + - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/apache-dev:alpine': + - 'webdevops/base-app:ubuntu-22.04' +'webdevops/ssh:latest': stage: level5 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -220,21 +146,21 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/apache-dev/alpine' - - 'docker build --no-cache -t webdevops/apache-dev:alpine .' + - 'cd docker/ssh/latest' + - 'docker build --no-cache -t webdevops/ssh:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache-dev:alpine" >> Dockerfile_63973bcba24dc2.25856506' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24dc2.25856506' + - 'echo "FROM webdevops/ssh:latest" >> Dockerfile_63985166075216.31550695' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075216.31550695' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache-dev_spec.rb webdevops/apache-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZS1kZXY6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNGRjMi4yNTg1NjUwNiJ9 Dockerfile_63973bcba24dc2.25856506' - - 'docker push webdevops/apache-dev:alpine' - - 'docker tag webdevops/apache-dev:alpine $CI_REGISTRY_IMAGE/apache-dev:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache-dev:alpine' + - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjExIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzUyMTYuMzE1NTA2OTUifQ== Dockerfile_63985166075216.31550695' + - 'docker push webdevops/ssh:latest' + - 'docker tag webdevops/ssh:latest $CI_REGISTRY_IMAGE/ssh:latest' + - 'docker push $CI_REGISTRY_IMAGE/ssh:latest' tags: - aws needs: - - 'webdevops/apache:alpine' -'webdevops/varnish:latest': + - 'webdevops/base-app:ubuntu-22.04' +'webdevops/vsftp:latest': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -243,22 +169,21 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/varnish/latest' - - 'docker build --no-cache -t webdevops/varnish:latest .' + - 'cd docker/vsftp/latest' + - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/varnish:latest" >> Dockerfile_63973bcba24fc5.73027503' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba24fc5.73027503' - - 'echo "ENV VARNISH_BACKEND_HOST webdevops.io" >> Dockerfile_63973bcba24fc5.73027503' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63985166075351.87215397' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075351.87215397' - 'bundle install' - - 'bash serverspec.sh spec/docker/varnish_spec.rb webdevops/varnish:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Zhcm5pc2g6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNGZjNS43MzAyNzUwMyJ9 Dockerfile_63973bcba24fc5.73027503' - - 'docker push webdevops/varnish:latest' - - 'docker tag webdevops/varnish:latest $CI_REGISTRY_IMAGE/varnish:latest' - - 'docker push $CI_REGISTRY_IMAGE/varnish:latest' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NTM1MS44NzIxNTM5NyJ9 Dockerfile_63985166075351.87215397' + - 'docker push webdevops/vsftp:latest' + - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' + - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/bootstrap:ubuntu-20.04': + - 'webdevops/base:ubuntu-22.04' +'webdevops/bootstrap:alpine': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -267,27 +192,23 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/bootstrap/ubuntu-20.04' - - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-20.04 .' + - 'cd docker/bootstrap/alpine' + - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-20.04" >> Dockerfile_63973bcba26ed2.42172274' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba26ed2.42172274' - - 'echo "RUN chmod +x /loop-entrypoint.sh" >> Dockerfile_63973bcba26ed2.42172274' - - 'echo "ENTRYPOINT /loop-entrypoint.sh" >> Dockerfile_63973bcba26ed2.42172274' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_639851660754a9.05182836' + - 'echo "COPY conf/ /" >> Dockerfile_639851660754a9.05182836' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNmVkMi40MjE3MjI3NCJ9 Dockerfile_63973bcba26ed2.42172274' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1NGE5LjA1MTgyODM2In0= Dockerfile_639851660754a9.05182836' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-20.04 --config bootstrap/test.yaml' - - 'docker push webdevops/bootstrap:ubuntu-20.04' - - 'docker tag webdevops/bootstrap:ubuntu-20.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-20.04' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-20.04' - - 'docker tag webdevops/bootstrap:ubuntu-20.04 webdevops/bootstrap:latest' - - 'docker push webdevops/bootstrap:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' + - 'docker push webdevops/bootstrap:alpine' + - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/base:ubuntu-20.04': +'webdevops/base:alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -296,25 +217,23 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/base/ubuntu-20.04' - - 'docker build --no-cache -t webdevops/base:ubuntu-20.04 .' + - 'cd docker/base/alpine' + - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-20.04" >> Dockerfile_63973bcba27105.41893738' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27105.41893738' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_639851660755f2.94419725' + - 'echo "COPY conf/ /" >> Dockerfile_639851660755f2.94419725' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIwLjA0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIwLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjcxMDUuNDE4OTM3MzgifQ== Dockerfile_63973bcba27105.41893738' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NTVmMi45NDQxOTcyNSJ9 Dockerfile_639851660755f2.94419725' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-20.04 --config base/test.yaml' - - 'docker push webdevops/base:ubuntu-20.04' - - 'docker tag webdevops/base:ubuntu-20.04 $CI_REGISTRY_IMAGE/base:ubuntu-20.04' - - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-20.04' - - 'docker tag webdevops/base:ubuntu-20.04 webdevops/base:latest' - - 'docker push webdevops/base:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' + - 'docker push webdevops/base:alpine' + - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base:alpine' tags: - aws needs: - - 'webdevops/bootstrap:ubuntu-20.04' -'webdevops/base-app:ubuntu-20.04': + - 'webdevops/bootstrap:alpine' +'webdevops/base-app:alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -323,144 +242,24 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/base-app/ubuntu-20.04' - - 'docker build --no-cache -t webdevops/base-app:ubuntu-20.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-20.04" >> Dockerfile_63973bcba27329.98226231' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27329.98226231' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMC4wNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6InVidW50dS0yMC4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI3MzI5Ljk4MjI2MjMxIn0= Dockerfile_63973bcba27329.98226231' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-20.04 --config base-app/test.yaml' - - 'docker push webdevops/base-app:ubuntu-20.04' - - 'docker tag webdevops/base-app:ubuntu-20.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-20.04' - - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-20.04' - - 'docker tag webdevops/base-app:ubuntu-20.04 webdevops/base-app:latest' - - 'docker push webdevops/base-app:latest' - tags: - - aws - needs: - - 'webdevops/base:ubuntu-20.04' -'webdevops/php:ubuntu-20.04': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php/ubuntu-20.04' - - 'docker build --no-cache -t webdevops/php:ubuntu-20.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:ubuntu-20.04" >> Dockerfile_63973bcba27548.82653387' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27548.82653387' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzU0OC44MjY1MzM4NyJ9 Dockerfile_63973bcba27548.82653387' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:ubuntu-20.04 --config php/test.yaml' - - 'docker push webdevops/php:ubuntu-20.04' - - 'docker tag webdevops/php:ubuntu-20.04 $CI_REGISTRY_IMAGE/php:ubuntu-20.04' - - 'docker push $CI_REGISTRY_IMAGE/php:ubuntu-20.04' - - 'docker tag webdevops/php:ubuntu-20.04 webdevops/php:latest' - - 'docker push webdevops/php:latest' - tags: - - aws - needs: - - 'webdevops/base-app:ubuntu-20.04' -'webdevops/php-nginx:ubuntu-20.04': - stage: level6 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/php-nginx/ubuntu-20.04' - - 'docker build --no-cache -t webdevops/php-nginx:ubuntu-20.04 .' + - 'cd docker/base-app/alpine' + - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:ubuntu-20.04" >> Dockerfile_63973bcba27770.49046260' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27770.49046260' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63985166075761.23739089' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075761.23739089' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzc3MC40OTA0NjI2MCJ9 Dockerfile_63973bcba27770.49046260' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzU3NjEuMjM3MzkwODkifQ== Dockerfile_63985166075761.23739089' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:ubuntu-20.04 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:ubuntu-20.04' - - 'docker tag webdevops/php-nginx:ubuntu-20.04 $CI_REGISTRY_IMAGE/php-nginx:ubuntu-20.04' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:ubuntu-20.04' - - 'docker tag webdevops/php-nginx:ubuntu-20.04 webdevops/php-nginx:latest' - - 'docker push webdevops/php-nginx:latest' - tags: - - aws - needs: - - 'webdevops/php:ubuntu-20.04' -'webdevops/mail-sandbox:latest': - stage: level7 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/mail-sandbox/latest' - - 'docker build --no-cache -t webdevops/mail-sandbox:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/mail-sandbox:latest" >> Dockerfile_63973bcba279b7.82185517' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba279b7.82185517' - - 'bundle install' - - 'bash serverspec.sh spec/docker/mail-sandbox_spec.rb webdevops/mail-sandbox:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL21haWwtc2FuZGJveDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyNzliNy44MjE4NTUxNyJ9 Dockerfile_63973bcba279b7.82185517' - - 'docker push webdevops/mail-sandbox:latest' - - 'docker tag webdevops/mail-sandbox:latest $CI_REGISTRY_IMAGE/mail-sandbox:latest' - - 'docker push $CI_REGISTRY_IMAGE/mail-sandbox:latest' - tags: - - aws - needs: - - 'webdevops/php-nginx:ubuntu-20.04' -'webdevops/dockerfile-build-env:latest': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/dockerfile-build-env/latest' - - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' - - 'docker push webdevops/dockerfile-build-env:latest' - - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - tags: - - aws - needs: - - 'webdevops/base-app:ubuntu-20.04' -'webdevops/ssh:latest': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/ssh/latest' - - 'docker build --no-cache -t webdevops/ssh:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/ssh:latest" >> Dockerfile_63973bcba27dd0.44079133' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27dd0.44079133' - - 'bundle install' - - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyN2RkMC40NDA3OTEzMyJ9 Dockerfile_63973bcba27dd0.44079133' - - 'docker push webdevops/ssh:latest' - - 'docker tag webdevops/ssh:latest $CI_REGISTRY_IMAGE/ssh:latest' - - 'docker push $CI_REGISTRY_IMAGE/ssh:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' + - 'docker push webdevops/base-app:alpine' + - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' tags: - aws needs: - - 'webdevops/base-app:ubuntu-20.04' -'webdevops/postfix:latest': - stage: level5 + - 'webdevops/base:alpine' +'webdevops/nginx:alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' @@ -468,21 +267,21 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/postfix/latest' - - 'docker build --no-cache -t webdevops/postfix:latest .' + - 'cd docker/nginx/alpine' + - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/postfix:latest" >> Dockerfile_63973bcba27fe3.49628457' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba27fe3.49628457' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_639851660758c5.44335061' + - 'echo "COPY conf/ /" >> Dockerfile_639851660758c5.44335061' - 'bundle install' - - 'bash serverspec.sh spec/docker/postfix_spec.rb webdevops/postfix:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Bvc3RmaXg6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMjdmZTMuNDk2Mjg0NTcifQ== Dockerfile_63973bcba27fe3.49628457' - - 'docker push webdevops/postfix:latest' - - 'docker tag webdevops/postfix:latest $CI_REGISTRY_IMAGE/postfix:latest' - - 'docker push $CI_REGISTRY_IMAGE/postfix:latest' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzU4YzUuNDQzMzUwNjEifQ== Dockerfile_639851660758c5.44335061' + - 'docker push webdevops/nginx:alpine' + - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' + - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' tags: - aws needs: - - 'webdevops/base-app:ubuntu-20.04' -'webdevops/vsftp:latest': + - 'webdevops/base:alpine' +'webdevops/apache:alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' @@ -491,20 +290,20 @@ stages: variables: DOCKER_BUILDKIT: '1' script: - - 'cd docker/vsftp/latest' - - 'docker build --no-cache -t webdevops/vsftp:latest .' + - 'cd docker/apache/alpine' + - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63973bcba281f3.81433975' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba281f3.81433975' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_639851660759d3.30259943' + - 'echo "COPY conf/ /" >> Dockerfile_639851660759d3.30259943' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImxhdGVzdCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTI4MWYzLjgxNDMzOTc1In0= Dockerfile_63973bcba281f3.81433975' - - 'docker push webdevops/vsftp:latest' - - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1OWQzLjMwMjU5OTQzIn0= Dockerfile_639851660759d3.30259943' + - 'docker push webdevops/apache:alpine' + - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' + - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' tags: - aws needs: - - 'webdevops/base:ubuntu-20.04' + - 'webdevops/base:alpine' 'webdevops/php:8.1': stage: level2 before_script: @@ -517,10 +316,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63973bcba2f3f0.22809859' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f3f0.22809859' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63985166075ae1.89864521' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075ae1.89864521' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMmYzZjAuMjI4MDk4NTkifQ== Dockerfile_63973bcba2f3f0.22809859' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1YWUxLjg5ODY0NTIxIn0= Dockerfile_63985166075ae1.89864521' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -544,10 +343,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63973bcba2f626.20557655' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f626.20557655' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63985166075c51.74213392' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075c51.74213392' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmNjI2LjIwNTU3NjU1In0= Dockerfile_63973bcba2f626.20557655' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NWM1MS43NDIxMzM5MiJ9 Dockerfile_63985166075c51.74213392' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -567,10 +366,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63973bcba2f813.52155543' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2f813.52155543' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63985166075dc9.62803358' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075dc9.62803358' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEyZjgxMy41MjE1NTU0MyJ9 Dockerfile_63973bcba2f813.52155543' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzVkYzkuNjI4MDMzNTgifQ== Dockerfile_63985166075dc9.62803358' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -590,10 +389,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63973bcba2fa03.12422849' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fa03.12422849' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63985166075f55.41777486' + - 'echo "COPY conf/ /" >> Dockerfile_63985166075f55.41777486' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMmZhMDMuMTI0MjI4NDkifQ== Dockerfile_63973bcba2fa03.12422849' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1ZjU1LjQxNzc3NDg2In0= Dockerfile_63985166075f55.41777486' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -615,10 +414,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63973bcba2fc26.57048267' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fc26.57048267' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63985166076112.30117508' + - 'echo "COPY conf/ /" >> Dockerfile_63985166076112.30117508' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmYzI2LjU3MDQ4MjY3In0= Dockerfile_63973bcba2fc26.57048267' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NjExMi4zMDExNzUwOCJ9 Dockerfile_63985166076112.30117508' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -638,10 +437,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63973bcba2fe54.73894217' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba2fe54.73894217' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63985166076243.37398296' + - 'echo "COPY conf/ /" >> Dockerfile_63985166076243.37398296' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTJmZTU0LjczODk0MjE3In0= Dockerfile_63973bcba2fe54.73894217' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NjI0My4zNzM5ODI5NiJ9 Dockerfile_63985166076243.37398296' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -663,10 +462,10 @@ stages: - 'cd docker/php-official/7.4-alpine' - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63973bcba30cd2.53266589' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba30cd2.53266589' + - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63985166076d05.32014587' + - 'echo "COPY conf/ /" >> Dockerfile_63985166076d05.32014587' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMwY2QyLjUzMjY2NTg5In0= Dockerfile_63973bcba30cd2.53266589' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NmQwNS4zMjAxNDU4NyJ9 Dockerfile_63985166076d05.32014587' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - 'docker push webdevops/php:7.4-alpine' @@ -690,10 +489,10 @@ stages: - 'cd docker/php-apache/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63973bcba30ee8.79644046' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba30ee8.79644046' + - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63985166076e87.56313875' + - 'echo "COPY conf/ /" >> Dockerfile_63985166076e87.56313875' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMGVlOC43OTY0NDA0NiJ9 Dockerfile_63973bcba30ee8.79644046' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzZlODcuNTYzMTM4NzUifQ== Dockerfile_63985166076e87.56313875' - 'docker push webdevops/php-apache:7.4-alpine' - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' @@ -713,10 +512,10 @@ stages: - 'cd docker/php-apache-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63973bcba310d6.78385701' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba310d6.78385701' + - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63985166077003.15026998' + - 'echo "COPY conf/ /" >> Dockerfile_63985166077003.15026998' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzEwZDYuNzgzODU3MDEifQ== Dockerfile_63973bcba310d6.78385701' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc3MDAzLjE1MDI2OTk4In0= Dockerfile_63985166077003.15026998' - 'docker push webdevops/php-apache-dev:7.4-alpine' - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' @@ -736,10 +535,10 @@ stages: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63973bcba312c8.45677744' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba312c8.45677744' + - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63985166077159.61926758' + - 'echo "COPY conf/ /" >> Dockerfile_63985166077159.61926758' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMxMmM4LjQ1Njc3NzQ0In0= Dockerfile_63973bcba312c8.45677744' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NzE1OS42MTkyNjc1OCJ9 Dockerfile_63985166077159.61926758' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4-alpine' @@ -761,10 +560,10 @@ stages: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_63973bcba31504.46929271' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba31504.46929271' + - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_639851660772f1.90842783' + - 'echo "COPY conf/ /" >> Dockerfile_639851660772f1.90842783' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMTUwNC40NjkyOTI3MSJ9 Dockerfile_63973bcba31504.46929271' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzcyZjEuOTA4NDI3ODMifQ== Dockerfile_639851660772f1.90842783' - 'docker push webdevops/php-nginx-dev:7.4-alpine' - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' @@ -784,10 +583,10 @@ stages: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63973bcba316f1.85062130' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba316f1.85062130' + - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63985166077448.91519419' + - 'echo "COPY conf/ /" >> Dockerfile_63985166077448.91519419' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMTZmMS44NTA2MjEzMCJ9 Dockerfile_63973bcba316f1.85062130' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzc0NDguOTE1MTk0MTkifQ== Dockerfile_63985166077448.91519419' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4-alpine' @@ -809,10 +608,10 @@ stages: - 'cd docker/php-official/7.4' - 'docker build --no-cache -t webdevops/php:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63973bcba331f7.20659322' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba331f7.20659322' + - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63985166078708.94296664' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078708.94296664' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzMxZjcuMjA2NTkzMjIifQ== Dockerfile_63973bcba331f7.20659322' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc4NzA4Ljk0Mjk2NjY0In0= Dockerfile_63985166078708.94296664' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - 'docker push webdevops/php:7.4' @@ -836,10 +635,10 @@ stages: - 'cd docker/php-apache/7.4' - 'docker build --no-cache -t webdevops/php-apache:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63973bcba33421.53986741' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33421.53986741' + - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63985166078886.67016479' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078886.67016479' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzNDIxLjUzOTg2NzQxIn0= Dockerfile_63973bcba33421.53986741' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ODg4Ni42NzAxNjQ3OSJ9 Dockerfile_63985166078886.67016479' - 'docker push webdevops/php-apache:7.4' - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' @@ -859,10 +658,10 @@ stages: - 'cd docker/php-apache-dev/7.4' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_63973bcba33631.32232296' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33631.32232296' + - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_639851660789d1.20546637' + - 'echo "COPY conf/ /" >> Dockerfile_639851660789d1.20546637' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzMzYzMS4zMjIzMjI5NiJ9 Dockerfile_63973bcba33631.32232296' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzg5ZDEuMjA1NDY2MzcifQ== Dockerfile_639851660789d1.20546637' - 'docker push webdevops/php-apache-dev:7.4' - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' @@ -882,10 +681,10 @@ stages: - 'cd docker/php-nginx/7.4' - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63973bcba33833.66888961' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33833.66888961' + - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63985166078ae2.48579456' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078ae2.48579456' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzM4MzMuNjY4ODg5NjEifQ== Dockerfile_63973bcba33833.66888961' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc4YWUyLjQ4NTc5NDU2In0= Dockerfile_63985166078ae2.48579456' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4' @@ -907,10 +706,10 @@ stages: - 'cd docker/php-nginx-dev/7.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63973bcba33ac5.59194279' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33ac5.59194279' + - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63985166078c32.68176340' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078c32.68176340' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzYWM1LjU5MTk0Mjc5In0= Dockerfile_63973bcba33ac5.59194279' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGMzMi42ODE3NjM0MCJ9 Dockerfile_63985166078c32.68176340' - 'docker push webdevops/php-nginx-dev:7.4' - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' @@ -918,24 +717,6 @@ stages: - aws needs: - 'webdevops/php-nginx:7.4' -'webdevops/piwik:latest': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/piwik/latest' - - 'docker build --no-cache -t webdevops/piwik:latest .' - - 'docker push webdevops/piwik:latest' - - 'docker tag webdevops/piwik:latest $CI_REGISTRY_IMAGE/piwik:latest' - - 'docker push $CI_REGISTRY_IMAGE/piwik:latest' - tags: - - aws - needs: - - 'webdevops/php-nginx:7.4' 'webdevops/php-dev:7.4': stage: level3 before_script: @@ -948,10 +729,10 @@ stages: - 'cd docker/php-dev/7.4' - 'docker build --no-cache -t webdevops/php-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63973bcba33e91.90384748' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba33e91.90384748' + - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63985166078e00.53330376' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078e00.53330376' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTMzZTkxLjkwMzg0NzQ4In0= Dockerfile_63973bcba33e91.90384748' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGUwMC41MzMzMDM3NiJ9 Dockerfile_63985166078e00.53330376' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4' @@ -973,10 +754,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63973bcba340b3.37543648' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba340b3.37543648' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63985166078fb8.76161242' + - 'echo "COPY conf/ /" >> Dockerfile_63985166078fb8.76161242' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM0MGIzLjM3NTQzNjQ4In0= Dockerfile_63973bcba340b3.37543648' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGZiOC43NjE2MTI0MiJ9 Dockerfile_63985166078fb8.76161242' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -1000,10 +781,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_63973bcba342d6.11255792' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba342d6.11255792' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_639851660790e1.62580202' + - 'echo "COPY conf/ /" >> Dockerfile_639851660790e1.62580202' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNDJkNi4xMTI1NTc5MiJ9 Dockerfile_63973bcba342d6.11255792' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzkwZTEuNjI1ODAyMDIifQ== Dockerfile_639851660790e1.62580202' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -1023,10 +804,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63973bcba344d4.66533556' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba344d4.66533556' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63985166079227.12932536' + - 'echo "COPY conf/ /" >> Dockerfile_63985166079227.12932536' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzQ0ZDQuNjY1MzM1NTYifQ== Dockerfile_63973bcba344d4.66533556' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc5MjI3LjEyOTMyNTM2In0= Dockerfile_63985166079227.12932536' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -1046,10 +827,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63973bcba346c1.50230384' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba346c1.50230384' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63985166079379.97344804' + - 'echo "COPY conf/ /" >> Dockerfile_63985166079379.97344804' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM0NmMxLjUwMjMwMzg0In0= Dockerfile_63973bcba346c1.50230384' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OTM3OS45NzM0NDgwNCJ9 Dockerfile_63985166079379.97344804' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -1071,10 +852,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63973bcba348f5.03736054' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba348f5.03736054' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63985166079499.10767070' + - 'echo "COPY conf/ /" >> Dockerfile_63985166079499.10767070' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNDhmNS4wMzczNjA1NCJ9 Dockerfile_63973bcba348f5.03736054' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzk0OTkuMTA3NjcwNzAifQ== Dockerfile_63985166079499.10767070' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -1094,10 +875,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63973bcba34b16.40431200' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba34b16.40431200' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63985166079597.87801228' + - 'echo "COPY conf/ /" >> Dockerfile_63985166079597.87801228' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNGIxNi40MDQzMTIwMCJ9 Dockerfile_63973bcba34b16.40431200' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzk1OTcuODc4MDEyMjgifQ== Dockerfile_63985166079597.87801228' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -1119,10 +900,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_63973bcba37302.69475502' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37302.69475502' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_6398516607b0a2.87505339' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b0a2.87505339' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM3MzAyLjY5NDc1NTAyIn0= Dockerfile_63973bcba37302.69475502' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YjBhMi44NzUwNTMzOSJ9 Dockerfile_6398516607b0a2.87505339' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -1146,10 +927,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_63973bcba37524.35016678' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37524.35016678' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_6398516607b242.64321131' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b242.64321131' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzNzUyNC4zNTAxNjY3OCJ9 Dockerfile_63973bcba37524.35016678' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2IyNDIuNjQzMjExMzEifQ== Dockerfile_6398516607b242.64321131' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -1169,10 +950,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_63973bcba37710.04963924' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37710.04963924' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_6398516607b3a7.44543896' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b3a7.44543896' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzc3MTAuMDQ5NjM5MjQifQ== Dockerfile_63973bcba37710.04963924' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiM2E3LjQ0NTQzODk2In0= Dockerfile_6398516607b3a7.44543896' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -1192,10 +973,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_63973bcba37904.82762017' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37904.82762017' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_6398516607b4f0.97492715' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b4f0.97492715' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM3OTA0LjgyNzYyMDE3In0= Dockerfile_63973bcba37904.82762017' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YjRmMC45NzQ5MjcxNSJ9 Dockerfile_6398516607b4f0.97492715' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -1217,10 +998,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_63973bcba37b72.01623258' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37b72.01623258' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_6398516607b640.02094991' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b640.02094991' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzN2I3Mi4wMTYyMzI1OCJ9 Dockerfile_63973bcba37b72.01623258' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2I2NDAuMDIwOTQ5OTEifQ== Dockerfile_6398516607b640.02094991' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -1240,10 +1021,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_63973bcba37d72.28156520' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37d72.28156520' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_6398516607b7e9.03137189' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b7e9.03137189' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzN2Q3Mi4yODE1NjUyMCJ9 Dockerfile_63973bcba37d72.28156520' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2I3ZTkuMDMxMzcxODkifQ== Dockerfile_6398516607b7e9.03137189' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -1265,10 +1046,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_63973bcba37f98.75818116' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba37f98.75818116' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_6398516607b969.97628102' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607b969.97628102' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzdmOTguNzU4MTgxMTYifQ== Dockerfile_63973bcba37f98.75818116' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiOTY5Ljk3NjI4MTAyIn0= Dockerfile_6398516607b969.97628102' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -1292,10 +1073,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_63973bcba381a2.72294704' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba381a2.72294704' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_6398516607ba88.66388314' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607ba88.66388314' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4MWEyLjcyMjk0NzA0In0= Dockerfile_63973bcba381a2.72294704' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmE4OC42NjM4ODMxNCJ9 Dockerfile_6398516607ba88.66388314' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -1315,10 +1096,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_63973bcba383e6.18449306' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba383e6.18449306' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_6398516607bbf7.78917613' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607bbf7.78917613' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzODNlNi4xODQ0OTMwNiJ9 Dockerfile_63973bcba383e6.18449306' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2JiZjcuNzg5MTc2MTMifQ== Dockerfile_6398516607bbf7.78917613' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -1338,10 +1119,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_63973bcba385d3.59543311' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba385d3.59543311' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_6398516607bd42.20207314' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607bd42.20207314' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzg1ZDMuNTk1NDMzMTEifQ== Dockerfile_63973bcba385d3.59543311' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiZDQyLjIwMjA3MzE0In0= Dockerfile_6398516607bd42.20207314' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -1363,10 +1144,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_63973bcba387f4.54918460' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba387f4.54918460' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_6398516607bec0.77440931' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607bec0.77440931' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4N2Y0LjU0OTE4NDYwIn0= Dockerfile_63973bcba387f4.54918460' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmVjMC43NzQ0MDkzMSJ9 Dockerfile_6398516607bec0.77440931' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -1386,10 +1167,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_63973bcba389f9.06165459' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba389f9.06165459' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_6398516607bff9.47792539' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607bff9.47792539' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM4OWY5LjA2MTY1NDU5In0= Dockerfile_63973bcba389f9.06165459' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmZmOS40Nzc5MjUzOSJ9 Dockerfile_6398516607bff9.47792539' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -1411,10 +1192,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_63973bcba398a9.65089242' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba398a9.65089242' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_6398516607ca24.57156846' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607ca24.57156846' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM5OGE5LjY1MDg5MjQyIn0= Dockerfile_63973bcba398a9.65089242' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3Y2EyNC41NzE1Njg0NiJ9 Dockerfile_6398516607ca24.57156846' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1438,10 +1219,10 @@ stages: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_63973bcba39ab5.90643987' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39ab5.90643987' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_6398516607cb38.48174882' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607cb38.48174882' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzOWFiNS45MDY0Mzk4NyJ9 Dockerfile_63973bcba39ab5.90643987' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2NiMzguNDgxNzQ4ODIifQ== Dockerfile_6398516607cb38.48174882' - 'docker push webdevops/php-apache:8.0-alpine' - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' @@ -1461,10 +1242,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_63973bcba39ca5.87075067' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39ca5.87075067' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_6398516607cc81.30619268' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607cc81.30619268' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhMzljYTUuODcwNzUwNjcifQ== Dockerfile_63973bcba39ca5.87075067' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdjYzgxLjMwNjE5MjY4In0= Dockerfile_6398516607cc81.30619268' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1484,10 +1265,10 @@ stages: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_63973bcba39e92.32025016' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba39e92.32025016' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_6398516607ce23.11215291' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607ce23.11215291' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTM5ZTkyLjMyMDI1MDE2In0= Dockerfile_63973bcba39e92.32025016' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3Y2UyMy4xMTIxNTI5MSJ9 Dockerfile_6398516607ce23.11215291' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0-alpine' @@ -1509,10 +1290,10 @@ stages: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_63973bcba3a0b5.32524529' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3a0b5.32524529' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_6398516607cfa1.97577974' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607cfa1.97577974' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYTBiNS4zMjUyNDUyOSJ9 Dockerfile_63973bcba3a0b5.32524529' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2NmYTEuOTc1Nzc5NzQifQ== Dockerfile_6398516607cfa1.97577974' - 'docker push webdevops/php-nginx-dev:8.0-alpine' - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' @@ -1532,10 +1313,10 @@ stages: - 'cd docker/php-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_63973bcba3a2b1.33298496' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3a2b1.33298496' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_6398516607d0b3.25232223' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607d0b3.25232223' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYTJiMS4zMzI5ODQ5NiJ9 Dockerfile_63973bcba3a2b1.33298496' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2QwYjMuMjUyMzIyMjMifQ== Dockerfile_6398516607d0b3.25232223' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0-alpine' @@ -1557,10 +1338,10 @@ stages: - 'cd docker/php-official/8.0' - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_63973bcba3b180.89402407' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b180.89402407' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_6398516607db89.53377067' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607db89.53377067' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhM2IxODAuODk0MDI0MDcifQ== Dockerfile_63973bcba3b180.89402407' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdkYjg5LjUzMzc3MDY3In0= Dockerfile_6398516607db89.53377067' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - 'docker push webdevops/php:8.0' @@ -1584,10 +1365,10 @@ stages: - 'cd docker/php-apache/8.0' - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_63973bcba3b397.08610675' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b397.08610675' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_6398516607dd21.07921991' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607dd21.07921991' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiMzk3LjA4NjEwNjc1In0= Dockerfile_63973bcba3b397.08610675' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZGQyMS4wNzkyMTk5MSJ9 Dockerfile_6398516607dd21.07921991' - 'docker push webdevops/php-apache:8.0' - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' @@ -1607,10 +1388,10 @@ stages: - 'cd docker/php-apache-dev/8.0' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_63973bcba3b599.41475809' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b599.41475809' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_6398516607de70.49246652' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607de70.49246652' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk3M2JjYmEzYjU5OS40MTQ3NTgwOSJ9 Dockerfile_63973bcba3b599.41475809' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2RlNzAuNDkyNDY2NTIifQ== Dockerfile_6398516607de70.49246652' - 'docker push webdevops/php-apache-dev:8.0' - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' @@ -1630,10 +1411,10 @@ stages: - 'cd docker/php-nginx/8.0' - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_63973bcba3b795.38715815' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b795.38715815' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_6398516607e0b8.04714040' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607e0b8.04714040' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5NzNiY2JhM2I3OTUuMzg3MTU4MTUifQ== Dockerfile_63973bcba3b795.38715815' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdlMGI4LjA0NzE0MDQwIn0= Dockerfile_6398516607e0b8.04714040' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0' @@ -1655,10 +1436,10 @@ stages: - 'cd docker/php-nginx-dev/8.0' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_63973bcba3b9a2.06874993' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3b9a2.06874993' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_6398516607e248.92337711' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607e248.92337711' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiOWEyLjA2ODc0OTkzIn0= Dockerfile_63973bcba3b9a2.06874993' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZTI0OC45MjMzNzcxMSJ9 Dockerfile_6398516607e248.92337711' - 'docker push webdevops/php-nginx-dev:8.0' - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' @@ -1678,10 +1459,10 @@ stages: - 'cd docker/php-dev/8.0' - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_63973bcba3bbb0.25794729' - - 'echo "COPY conf/ /" >> Dockerfile_63973bcba3bbb0.25794729' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_6398516607e3a7.91318455' + - 'echo "COPY conf/ /" >> Dockerfile_6398516607e3a7.91318455' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTczYmNiYTNiYmIwLjI1Nzk0NzI5In0= Dockerfile_63973bcba3bbb0.25794729' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZTNhNy45MTMxODQ1NSJ9 Dockerfile_6398516607e3a7.91318455' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0' diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index c7a1bba10..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,250 +0,0 @@ -# Change Log -All notable changes to this project will be documented in this file. -This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile). - -## [1.5.0] - 2017-03-01 -- Added ubuntu-16.10 -- Add centos-7-php7 -- Change liquibase execution handling (now using relative paths, easier to maintain) -- Smaller improvements - -## [1.4.1] - 2017-02-14 -- Add webdevops/typo3-solr:3.1 -- Add webdevops/typo3-solr:4.0 -- Add webdevops/typo3-solr:5.0 -- Fix minor issues in bin/console script - -## [1.4.0] - 2017-02-12 -- Add webdevops/typo3-solr:6.0 -- Improve testsuite and fixed minor issues - -## [1.3.5] - 2017-02-12 -- Improve and fix parallel run of serverspec -- Reduced python subprocess wait loop cpu time - -## [1.3.4] - 2017-02-03 -- Add serverspec wrapper (do not run tests if Dockerfile isn't set or available) - -## [1.3.3] - 2017-02-03 -- Improve logging (no output of environment variables, eg. php) -- Add xdebug profiler environment variables -- Fix docker installation for samson - -## [1.3.2] - 2017-02-01 -- Fix new package names for debian-9 - -## [1.3.1] - 2017-01-30 -- Introduce /entrypoint.d and /entrypoint.cmd -- Switch to endless tail in noop cmd (entrypoint cmd) -- Improve syslog (eg. configuration improvements; switch to file/pipe based if tty is available or not; fixes warning) -- Improved serverspec run (missing fsync after creation of Dockerfile) -- Remove Makefile target dist-upgrade (not needed anymore) -- Merge setup and requiements target -- Introduce RETRY env var, set default to 1 -- Smaller bugfixes - -## [1.3.0] - 2017-01-26 -- Enabled `docker --user` support -- Added `service check` for checking if a service is running -- Added test to check if the services are staying up (see `service check`) -- Implemented rspec-retry -- Disabeld php-fpm access logging for production images (default; high log load) -- Introduced /entrypoit.d (symlink) - -## [1.2.4] - 2017-01-20 -- Enable sshd for php-dev images -- Set root and application password of php-dev images to "dev" -- Fixed syslog-ng error message about log file destination (use pipe instead of file) -- Fixed test of debian-9 (distribution version is now "9", was "testing" before; upstream) - -## [1.2.3] - 2017-01-10 -- Removed default nginx vhost configuration (configuration collision) for alpine - -## [1.2.2] - 2017-01-09 -- Removed deprecated SSLCompression option in Apache configuration (was disabled anyway) - -## [1.2.1] - 2017-01-08 -- Update to alpine 3.5 -- Enabled php7 builds again -- Removed redis from alpine (not available anymore) -- Added build-essentials for samson-deployment - -## [1.2.0] - 2017-01-06 -- Add mod_proxy_fcgi and mod_fastcgi configuration for Apache (Debian 9 doesn't provide mod_fastcgi anymore; using ifmodule-directive for automatic configuration switching) -- Removed mod_fastcgi on most installations were it is not needed -- Added tests to ensure /dev/null and /dev/zero are writeable -- Removed postfix hostname (is sometimes injected via installation) -- Fixed smaller bugs -- Fixed bin/console docker:exec command execution -- Updated gems for serverspec - -## [1.1.4] - 2016-12-20 -- Add task dependencies for docker:push (push in the right order) -- Show blacklist/whitelist for bin/console commands (even if not in verbose mode) -- Revert "Improve default entrypoint cmd" because of bugs, old handling is better - -## [1.1.3] - 2016-12-18 -- Fix critical docker hang bug (using stdin instead of stdout for log) -- Add /docker.stderr - -## [1.1.2] - 2016-12-16 -- Fix asset permissions in samson-deployment (fixed tests) - -## [1.1.1] - 2016-12-15 -- Fix provision and configuration for samson-deployment (fixed tests) - -## [1.1.0] - 2016-12-14 -- Fixed dnsmasq startup -- Removed all logfiles inside containers (using stdout) -- Fixed syslog-ng setup (was complaining about version) -- Fixed some php/hhvm tests -- Improve bin/console -- Add cleanup after container installation -- Add multiple vhost support for dns lookup (VIRTUAL_HOST) - -## [1.0.0] - 2016-11-28 -- Introduced python based processing script -- Introduced testinfra test suite -- Updated documentation -- Added roundcube to `webdevops/mail-sandbox` -- Update liquibase to 3.5.3 - -## [0.57.1] - 2016-10-11 -- Added webdevops/liquibase:mysql (same as latest) with mysql support -- Added webdevops/liquibase:postgres with postgres support - -## [0.57.0] - 2016-10-10 -- Removed version numbers in php configuration in apache -- Added liquibase image - -## [0.56.1] - 2016-09-12 -- Removed geoip database - -## [0.56.0] - 2016-09-11 -- Fix non caching resource files not be passed to document root in `php-nginx-dev` -- Added update of geoip database for applications (currently testing only) -- Added graphviz and ttf-dejavu for `sphinx` -- Added setting `VIRTUAL_HOST` to internal loopback address via dnsmasq - -## [0.55.3] - 2016-07-30 -- Moved gpg to base - -## [0.55.2] - 2016-07-30 -- Add gpg for php-dev (required by blackfire installation) - -## [0.55.1] - 2016-07-29 -- Renamed 99-webdevops.ini to 98-webdevops.ini for PHP-7 images (Bug) - -## [0.55.0] - 2016-07-01 -- Add docker env vars for XDEBUG and BLACKFIRE -- Added blackfire-agent for php-dev - -## [0.54.0] - 2016-06-30 -- Update alpine-3 to 3.4 -- Fixed webdevops/php:alpine-3 -- Fixed webdevops/php:alpine-3-php7 -- Added webdevops/cerbot for let's encrypt -- Improved docker graph (image build) -- Added WHITELIST for image building - -## [0.53.2] - 2016-06-27 -- Added test for `PHP_DEBUGGER` blackfire - -## [0.53.1] - 2016-06-27 -- Fixed and improved `PHP_DEBUGGER` for php-dev - -## [0.53.0] - 2016-06-23 -- Added apache-dev and nginx-dev -- Restructed php-*dev provision -- Removed whoami call -- Removed provision from `make all` and `make build` -- Removed --force from apk-install -- Fixed pecl for alpine images -- Updated documentation and tests - -## [0.52.0] - 2016-06-20 -- Added tag centos-7-php56 for php images -- Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables -- Added pysed -- Added PHP_DEBUGGER environment variable for php*dev images -- Fix warnings in vsftp image -- Fix package names in alpine (broken build) -- Updated documentation and tests - -## [0.51.0] - 2016-06-16 -- Added php module apcu -- Added (disabled) php module blackfire to php-dev and inherit images -- Added apt-transport-https for debian family images -- Added link from /etc/aliases to /etc/postfix/alises for alpine - -## [0.50.6] - 2016-06-14 -- Switch from dotdeb to sury and install libpcre3 from testing - -## [0.50.5] - 2016-06-10 -- Added Magallanes deployer for samson-deployment -- Improved documentation - -## [0.50.4] - 2016-06-06 -- Removed superfluous environment variables for PHP inside nginx -- Added more layout sections to documentation - - -## [0.50.3] - 2016-06-06 -- Added `WEB_PHP_SOCKET` for apache and nginx images, this env variable specifies the host where php-fpm is listening -- Added `WEB_NO_CACHE_PATTERN` to apache and nginx images (regexp of files which should not be cached by browser) for php*-dev images -- Added `make baselayout` for building baselayout.tar (not always needed) -- Added php-fpm clear_env workaround for php-fpm versions which doesn't support it -- Set PHP-FPM ports to public on php*-dev images -- Set mail-sandbox to latest tag (using Ubuntu 16.04) -- Moved environment macros of jinja2 templates to environment.jinja2 -- Updated documentation - -## [0.50.2] - 2016-05-27 -- Fix /opt/docker/bin/service.d/php-fpm.sh using php.d instead of php-fpm.d -- Restructured documentation, Added customization section - -## [0.50.1] - 2016-05-24 -- Fixed required root rights for entrypoint, provisioning is now only running when entrypoint is entered with root -- Modularized service.d scripts (will include servide.d/$serv.d/*.sh before execution) - -## [0.50.0] - 2016-05-23 -- Improve image sizes (backported to 0.23.0 due to build issues) -- Improved provisioning system with new python wrapper -- Modularized apache and nginx configuration -- Dockerfile are now generated via jinja2 files -- webdevops/storage is now using busybox -- Latest tag is now ubuntu 16.04 -- Set clear_env to no for php-fpm (if possible) -- Added ubuntu 16.04 images (eg. php, hhvm) -- Added webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev (xdebug and disabled caching for webserver) -- Added webdevops/varnish -- Added mod_expire for webdevops/apache - -## [0.23.0] - 2016-04-03 -- Enabled alpine-3-php7 images -- Fixed some smaller issues -- Added TYPO3 packages to sphinx image -- Fixed build system for new docker version (1.11.0) - -## [0.22.0] - 2016-04-03 -- Introduced base-app for application images -- Added alpine-3 images -- Added sphinx image - -## [0.21.6] - 2016-03-25 -- Refactored directory layout (container -> docker/, .bin -> bin, testsuite -> test/ - -## [0.21.5] - 2016-03-24 -- Fixed permissions automatically for /tmp if mounted as volume -- Added error checks for samson service script - -## [0.21.0] - 2016-03-20 -- Improved entrypoint startup time -- Removed entrypoint ansible provisioning if not needed -- Added java-jre and latest npm for samson-deployment - - -## [0.20.0] - 2016-02-24 -- Added sqlite to base images -- Moved WEB_DOCUMENT_ROOT to /app (from /application/code) -- Improved samson-deployment diff --git a/LICENSE b/LICENSE index 96d96a0f6..87ec11b0c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2016 WebDevOps +Copyright (c) 2015-2023 WebDevOps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 781d8a4cf..8c239643d 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,3 @@ documentation: -e "VIRTUAL_PORT=8000" \ webdevops/sphinx sphinx-autobuild \ --poll -H 0.0.0.0 /opt/docs html - -webdevops/%: - python2 ./bin/console docker:build --threads=auto --whitelist=$@ diff --git a/README.md b/README.md index 761589ddf..8868e653a 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,65 @@ # Introduction +We provide images which extend the official [PHP-Images](https://hub.docker.com/_/php/tags). +We add additional stuff like: + +* almost any PHP module preinstalled +* configuration based on ENV variables +* run multiple services (like php-fpm and nginx) with supervisord + [![GitHub issues](https://img.shields.io/github/issues/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/issues)[![GitHub forks](https://img.shields.io/github/forks/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/network)[![GitHub stars](https://img.shields.io/github/stars/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/stargazers)[![GitHub license](https://img.shields.io/github/license/webdevops/Dockerfile.svg)](https://github.com/webdevops/Dockerfile/blob/master/LICENSE) -[![pipeline status](https://gitlab.com/webdevops/autobuild/badges/master/pipeline.svg)](https://gitlab.com/webdevops/autobuild/commits/master) +[![pipeline status](https://gitlab.com/webdevops/dockerfile/badges/master/pipeline.svg)](https://gitlab.com/webdevops/dockerfile/commits/master) + -![Dockerfile](https://static.webdevops.io/dockerfile.svg) -Automated build and test running on [WebDevOps CI](https://gitlab.com/webdevops/autobuild/) \(GitLab.com CI custom AWS runner\) sponsored by [Onedrop GmbH & Co. KG](https://1drop.de). +Automated build and test running on [Gitlab CI](https://gitlab.com/webdevops/dockerfile/) \(GitLab.com CI custom Google Cloud runner\) sponsored by [Onedrop GmbH & Co. KG](https://1drop.de). [![Docker layout](documentation/gitbook/.gitbook/assets/docker-image-layout.gv.png)](https://github.com/webdevops/Dockerfile/tree/511a870fa90fe53da5c63a95b4254f6980e6d3d2/documentation/docs/resources/images/docker-image-layout.gv.png) ## Communication and support -Join us on [Slack](https://webdevops.io/slack/) - Or write an issue in our [GitHub repository](https://github.com/webdevops/Dockerfile/issues). -## Documentation +## Build process -* [Old version of the documentation is available on readthedocs](https://dockerfile.readthedocs.io/) -* [New version is currently being written on gitbook](https://webdevops.gitbook.io/dockerfile) +### File generation + +The general build process is currently a mixture of python jinja2 legacy and PHP. + +First we build the files inside the `docker` directory using this command: + +``` +docker run --rm -ti -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision +``` -## Deprecations +It will use the Jinja2 templates inside of the `template` directory and the +config files from the `provisioning` directory. -### Debian/Ubuntu PHP +**The files in the `docker` directory are never modified manually** -The following images are DEPRECATED and not longer built automatically: +*This will be replaced with PHP twig templates in the future to streamline everything.* +### Building in CI -* `webdevops/php:ubuntu-*` -* `webdevops/php:debian-*` -* `webdevops/php-dev:ubuntu-*` -* `webdevops/php-dev:debian-*` -* `webdevops/php-apache:ubuntu-*` -* `webdevops/php-apache:debian-*` -* `webdevops/php-apache-dev:ubuntu-*` -* `webdevops/php-apache-dev:debian-*` -* `webdevops/php-nginx:ubuntu-*` -* `webdevops/php-nginx:debian-*` -* `webdevops/php-nginx-dev:ubuntu-*` -* `webdevops/php-nginx-dev:debian-*` +We generate a multi stage Gitlab-CI configuration using PHP: -Also only supported PHP versions are built automatically. +``` +docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.1 composer install +docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.1 ci/console gitlab:generate +``` -You shall use the new images which are based on the official `php:(7|8).(0|1|2|3|4)-fpm` images. -The official PHP images are based on debian. +Gitlab CI builds every image independant and runs serverspec and structure tests on every +image before pushing them to the registry. + +## Documentation + +As in many projects the documentation is kind of up to date 😅. + +* [Old version of the documentation is available on readthedocs](https://dockerfile.readthedocs.io/) +* [New version is currently being written on gitbook](https://webdevops.gitbook.io/dockerfile) + +### Debian PHP + +The following images which are currently supported are based on `php:{VER}-fpm-buster`. * `webdevops/php:7.4` * `webdevops/php:8.0` @@ -72,28 +89,7 @@ The official PHP images are based on debian. ### Alpine PHP -The following images are DEPRECATED and not longer built automatically: - -* `webdevops/php:alpine` -* `webdevops/php:alpine-3` -* `webdevops/php:alpine-3-php7` -* `webdevops/php-dev:alpine` -* `webdevops/php-dev:alpine-3` -* `webdevops/php-dev:alpine-3-php7` -* `webdevops/php-apache:alpine` -* `webdevops/php-apache:alpine-3` -* `webdevops/php-apache:alpine-3-php7` -* `webdevops/php-apache-dev:alpine` -* `webdevops/php-apache-dev:alpine-3` -* `webdevops/php-apache-dev:alpine-3-php7` -* `webdevops/php-nginx:alpine` -* `webdevops/php-nginx:alpine-3` -* `webdevops/php-nginx:alpine-3-php7` -* `webdevops/php-nginx-dev:alpine` -* `webdevops/php-nginx-dev:alpine-3` -* `webdevops/php-nginx-dev:alpine-3-php7` - -You shall use the new images which are based on the official `php:7.(1|2|3|4)-fpm-alpine` images. +The following images which are currently supported are based on `php:{VER}-fpm-alpine`. * `webdevops/php:7.4-alpine` * `webdevops/php:8.0-alpine` @@ -119,5 +115,3 @@ You shall use the new images which are based on the official `php:7.(1|2|3|4)-fp * `webdevops/php-nginx-dev:8.0-alpine` * `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` - -*We left out 7.0 because it would vary too much from the current versions* diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 4457d62f5..0c11aff10 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -190,7 +190,6 @@ def generate_serverspec_configuration(path, dockerfile, configuration, is_toolim ret['DOCKER_IMAGE'] = dockerfile['image']['fullname'] ret['DOCKER_TAG'] = dockerfile['image']['tag'] ret['DOCKERFILE'] = path - ret['DOCKER_IS_TOOLIMAGE'] = str(int(is_toolimage)) return ret diff --git a/ci/BLACKLIST b/ci/BLACKLIST index b5fd05256..c0d340a59 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -1,11 +1,3 @@ -ubuntu -debian -ansible -samson -sphinx -centos -solr -liqui 5.6 7.0 7.1 diff --git a/ci/build-ci.php b/ci/build-ci.php deleted file mode 100644 index d29d11c93..000000000 --- a/ci/build-ci.php +++ /dev/null @@ -1,187 +0,0 @@ -checkDependency(); - $this->getImageName(); - $this->generateJobName(); - } - - private function checkDependency() - { - $f = fopen($this->path, 'r'); - while (($line = fgets($f)) !== false) { - if (strpos($line, 'FROM') === 0) { - $this->dependency = trim(substr($line, 5)); - if (strpos($this->dependency, 'webdevops/') === 0) { - $this->dependencyIsExternal = false; - $this->dependency = str_replace('latest', 'ubuntu-16.04', $this->dependency); - } else { - $this->dependencyIsExternal = true; - } - } - } - fclose($f); - } - - private function getImageName() - { - $f = fopen($this->path, 'r'); - while (($line = fgets($f)) !== false) { - if (strpos($line, '# Dockerfile for ') === 0) { - $imageName = trim(substr($line, 17)); - $imageName = str_replace('-official', '', $imageName); - $this->image = $imageName; - break; - } - } - fclose($f); - } - - private function generateJobName() - { - $jobName = str_replace('webdevops/', '', $this->image); - $this->jobName = $jobName; - } -} - - -$gitlabCi = [ - 'image' => 'docker', - 'stages' => [], -]; -$dockerfiles = []; -$maxLevel = 0; - -/* - * Scan for all Dockerfile files - */ -chdir(__DIR__ . '/../'); -$dirItr = new RecursiveDirectoryIterator('docker'); -$itr = new RecursiveIteratorIterator($dirItr); -foreach ($itr as $filePath => $fileInfo) { - if ($fileInfo->getFilename() === 'Dockerfile') { - $dockerfile = new DockerfileStruct(); - $dockerfile->path = $fileInfo->getPathname(); - $dockerfile->parse(); - $dockerfiles[$dockerfile->image] = $dockerfile; - } -} - -/* - * Build dependency levels - */ -$checkedImages = []; -while (count($checkedImages) < count($dockerfiles)) { - foreach ($dockerfiles as $image => $dockerfile) { - if (in_array($image, $checkedImages)) { - continue; - } - if ($dockerfile->dependencyIsExternal) { - $checkedImages[] = $image; - } else if (in_array($dockerfile->dependency, $checkedImages)) { - $dockerfile->level = $dockerfiles[$dockerfile->dependency]->level + 1; - if ($dockerfile->level > $maxLevel) { - $maxLevel = $dockerfile->level; - } - $checkedImages[] = $image; - $dockerfiles[$image] = $dockerfile; - } - } -} - -/* - * Fill stages - */ -$gitlabCi['stages'] = array_map(function($i) { return 'level' . $i; }, range(0, $maxLevel)); -array_unshift($gitlabCi['stages'], 'build-env'); - -/* - * Sort dockerfiles by level and jobName - */ -usort($dockerfiles, function($a, $b) { - if ($a->level === $b->level) { - return ($a->jobName < $b->jobName) ? -1 : 1; - } - return ($a->level < $b->level) ? -1 : 1; -}); - -/* - * Build Gitlab CI YAML - */ -foreach ($dockerfiles as $dockerfile) { - $script = [ - 'cd ' . dirname($dockerfile->path), - //'docker build --no-cache -t ' . $dockerfile->image . ' .', - 'docker build --no-cache -t $CI_REGISTRY_IMAGE/' . $dockerfile->jobName . ' .', - ]; - - // Add tests if available - list($type, $distro) = explode(':', $dockerfile->jobName); - if (file_exists(__DIR__ . '/../tests/structure-test/' . $type . '/test.yaml')) { - $script[] = 'cd $CI_PROJECT_DIR/tests/structure-test'; - if (file_exists(__DIR__ . '/../tests/structure-test/' . $type . '/' . $distro . '/test.yaml')) { - //$script[] = 'container-structure-test test --image ' . $dockerfile->image . ' --config ' . $type . '/test.yaml --config ' . $type . '/' . $distro . '/test.yaml'; - $script[] = '/usr/local/bin/container-structure-test test --image $CI_REGISTRY_IMAGE/' . $dockerfile->jobName . ' --config ' . $type . '/test.yaml --config ' . $type . '/' . $distro . '/test.yaml'; - } else { - //$script[] = 'container-structure-test test --image ' . $dockerfile->image . ' --config ' . $type . '/test.yaml'; - $script[] = '/usr/local/bin/container-structure-test test --image $CI_REGISTRY_IMAGE/' . $dockerfile->jobName . ' --config ' . $type . '/test.yaml'; - } - } - - /* - $testDockerfile = uniqid('Dockerfile_', true); - if (true) { - $script = array_merge($script, [ - 'cd $CI_PROJECT_DIR/tests/serverspec', - 'echo "FROM ' . $dockerfile->image . '" >> ' . $testDockerfile, - 'echo "COPY conf/ /" >> ' . $testDockerfile, - 'bash serverspec.sh spec/docker/php_spec.rb ' . $dockerfile->image .' ' . $encodedJsonConfig . ' ' . $testDockerfile, - ]); - } - */ - $script = array_merge($script, [ - //'docker push ' . $dockerfile->image - 'docker push $CI_REGISTRY_IMAGE/' . $dockerfile->jobName - ]); - - $gitlabCi[$dockerfile->jobName] = [ - 'stage' => 'level' . $dockerfile->level, - 'before_script' => [ - //'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'apk add curl', - 'curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64', - 'chmod +x container-structure-test-linux-amd64', - 'mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test', - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - ], - 'script' => $script, - 'retry' => 2, - 'tags' => ['aws'], - //'only' => ['master'] - ]; - if (!$dockerfile->dependencyIsExternal && !empty($dockerfile->dependency)) { - $gitlabCi[$dockerfile->jobName]['dependencies'] = [str_replace('webdevops/', '', $dockerfile->dependency)]; - } -} -// TODO: fix cyclic dependency -//$gitlabCi['dockerfile-build-env:latest']['stage'] = 'build-env'; - - -/* - * Store YAML - */ -$yaml = Yaml::dump($gitlabCi, 4); -file_put_contents('ci/gitlab-ci.yml', $yaml); diff --git a/ci/composer.json b/ci/composer.json index bef01a0ee..c1d9a46c2 100644 --- a/ci/composer.json +++ b/ci/composer.json @@ -4,15 +4,15 @@ "license": "MIT", "authors": [ { - "name": "Hans Höchtl", + "name": "Hans Tuscher", "email": "hhoechtl@1drop.de" } ], "require": { "bluem/tree": "^3.1", - "symfony/yaml": "^5.0", - "symfony/console": "^5.0", - "symfony/process": "^5.0" + "symfony/yaml": "^6.0", + "symfony/console": "^6.0", + "symfony/process": "^6.0" }, "autoload": { "psr-4": { diff --git a/ci/composer.lock b/ci/composer.lock index e51aea37d..0b69e470e 100644 --- a/ci/composer.lock +++ b/ci/composer.lock @@ -4,29 +4,28 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b106e6cc32475d0f7661756c911f0ded", + "content-hash": "14ae3be283bf9d8b8f243e21e404d706", "packages": [ { "name": "bluem/tree", - "version": "3.1", + "version": "3.2", "source": { "type": "git", "url": "https://github.com/BlueM/Tree.git", - "reference": "e520150cc713b4318c6ceae05d578462d930bc59" + "reference": "2369895e54397115e99252dde42d929897d6dbc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BlueM/Tree/zipball/e520150cc713b4318c6ceae05d578462d930bc59", - "reference": "e520150cc713b4318c6ceae05d578462d930bc59", + "url": "https://api.github.com/repos/BlueM/Tree/zipball/2369895e54397115e99252dde42d929897d6dbc4", + "reference": "2369895e54397115e99252dde42d929897d6dbc4", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.0" + "php": ">=7.3 || >=8.0" }, "require-dev": { - "doctrine/instantiator": "1.0.*", - "phpunit/phpunit": "6.*" + "phpunit/phpunit": ">=8.0 || >=9.0" }, "type": "library", "autoload": { @@ -52,28 +51,33 @@ ], "support": { "issues": "https://github.com/BlueM/Tree/issues", - "source": "https://github.com/BlueM/Tree/tree/3.1" + "source": "https://github.com/BlueM/Tree/tree/3.2" }, - "time": "2019-09-15T06:11:51+00:00" + "time": "2021-12-30T15:21:38+00:00" }, { "name": "psr/container", - "version": "1.1.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -100,50 +104,49 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "symfony/console", - "version": "v5.2.8", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768" + "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768", + "url": "https://api.github.com/repos/symfony/console/zipball/58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", + "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.4|^6.0" }, "conflict": { - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -183,7 +186,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.8" + "source": "https://github.com/symfony/console/tree/v6.2.1" }, "funding": [ { @@ -199,29 +202,29 @@ "type": "tidelift" } ], - "time": "2021-05-11T15:45:21+00:00" + "time": "2022-12-01T13:44:20+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -250,7 +253,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" }, "funding": [ { @@ -266,32 +269,35 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -299,12 +305,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -329,7 +335,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -345,20 +351,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.1", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -370,7 +376,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -378,12 +384,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -410,7 +416,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -426,20 +432,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -451,7 +457,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -459,12 +465,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -494,7 +500,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -510,109 +516,35 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-01-22T09:19:47+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.22.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -620,104 +552,18 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-01-07T16:49:33+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.22.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.22-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -727,16 +573,17 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Symfony polyfill for the Mbstring extension", "homepage": "https://symfony.com", "keywords": [ "compatibility", + "mbstring", "polyfill", "portable", "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -752,25 +599,24 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", - "version": "v5.2.7", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e" + "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e", - "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e", + "url": "https://api.github.com/repos/symfony/process/zipball/ba6e55359f8f755fe996c58a81e00eaa67a35877", + "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.15" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -798,7 +644,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.3.0-BETA1" + "source": "https://github.com/symfony/process/tree/v6.2.0" }, "funding": [ { @@ -814,25 +660,28 @@ "type": "tidelift" } ], - "time": "2021-04-08T10:27:02+00:00" + "time": "2022-11-02T09:08:04+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239", + "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1" + "php": ">=8.1", + "psr/container": "^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -840,7 +689,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -850,7 +699,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -877,7 +729,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.1.1" }, "funding": [ { @@ -893,44 +745,47 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2022-05-30T19:18:58+00:00" }, { "name": "symfony/string", - "version": "v5.2.8", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" + "reference": "145702685e0d12f81d755c71127bfff7582fdd36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "url": "https://api.github.com/repos/symfony/string/zipball/145702685e0d12f81d755c71127bfff7582fdd36", + "reference": "145702685e0d12f81d755c71127bfff7582fdd36", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -960,7 +815,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.8" + "source": "https://github.com/symfony/string/tree/v6.2.0" }, "funding": [ { @@ -976,32 +831,31 @@ "type": "tidelift" } ], - "time": "2021-05-10T14:56:10+00:00" + "time": "2022-11-30T17:13:47+00:00" }, { "name": "symfony/yaml", - "version": "v5.2.7", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5" + "reference": "f2570f21bd4adc3589aa3133323273995109bae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f2570f21bd4adc3589aa3133323273995109bae0", + "reference": "f2570f21bd4adc3589aa3133323273995109bae0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-ctype": "~1.8" + "php": ">=8.1", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<4.4" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^4.4|^5.0" + "symfony/console": "^5.4|^6.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1035,7 +889,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.2.7" + "source": "https://github.com/symfony/yaml/tree/v6.2.0" }, "funding": [ { @@ -1051,7 +905,7 @@ "type": "tidelift" } ], - "time": "2021-04-29T20:47:09+00:00" + "time": "2022-11-25T19:00:27+00:00" } ], "packages-dev": [], @@ -1062,5 +916,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.2.0" } diff --git a/ci/src/FileReader.php b/ci/src/FileReader.php index 8f8465f7d..faebfbc8a 100644 --- a/ci/src/FileReader.php +++ b/ci/src/FileReader.php @@ -32,7 +32,6 @@ public function getInfo(string $dockerfilePath) $imageName = $headerMatches[1]; $tagName = $headerMatches[2]; $id = 'webdevops/' . $imageName . ':' . $tagName; - $isToolImage = in_array('/' . $imageName, $this->_settings['dockerTest']['toolImages']); $regex = '/' . $this->_settings['dockerTest']['configuration']['imageConfigurationRegex'] . '/'; preg_match_all($regex, $id, $serverSpecMatches); $node = [ @@ -45,7 +44,6 @@ public function getInfo(string $dockerfilePath) 'parent' => 0, 'serverspec' => [ 'DOCKER_IMAGE' => $id, - 'DOCKER_IS_TOOLIMAGE' => $isToolImage ? '1' : '0', 'DOCKER_TAG' => $tagName, 'OS_FAMILY' => $serverSpecMatches['OS_FAMILY'][0] ?? $this->_settings['dockerTest']['configuration']['default']['OS_FAMILY'], 'OS_VERSION' => $serverSpecMatches['OS_VERSION'][0] ?? $this->_settings['dockerTest']['configuration']['default']['OS_VERSION'], diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php index 2f6db3597..563087d40 100644 --- a/ci/src/JobBuilder.php +++ b/ci/src/JobBuilder.php @@ -80,10 +80,6 @@ private function serverSpec(array $node) 'echo "FROM ' . $node['id'] . '" >> ' . $testDockerfile, 'echo "COPY conf/ /" >> ' . $testDockerfile, ]; - if ($node['serverspec']['DOCKER_IS_TOOLIMAGE']) { - $script[] = 'echo "RUN chmod +x /loop-entrypoint.sh" >> ' . $testDockerfile; - $script[] = 'echo "ENTRYPOINT /loop-entrypoint.sh" >> ' . $testDockerfile; - } if ($node['image'] === 'varnish') { $script[] = 'echo "ENV VARNISH_BACKEND_HOST webdevops.io" >> ' . $testDockerfile; } diff --git a/conf/console.yml b/conf/console.yml index 085c6fc5c..31be20664 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -12,7 +12,7 @@ blacklistFile: 'BLACKLIST' docker: imagePrefix: 'webdevops' - autoLatestTag: 'ubuntu-20.04' + autoLatestTag: 'ubuntu-22.04' pathRegex: '/(?P[^/]+)/(?P[^/]+)/Dockerfile$' autoPull: True autoPullBlacklist: '^webdevops/.*' @@ -21,41 +21,16 @@ docker: graph: label: 'Webdevops Images\n%s' - dockerTest: - toolImages: - - '/bootstrap' - - '/ansible' - - '/liquibase' - - '/certbot' - serverspec: specPath: 'spec/docker/%s_spec.rb' - dockerfile: - '/varnish': - - 'ENV VARNISH_BACKEND_HOST webdevops.io' - configuration: imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-?(?P[^-]+)?' default: - OS_FAMILY: 'ubuntu' - OS_VERSION: '20.04' + OS_FAMILY: 'debian' + OS_VERSION: '11' image: - ':centos': - OS_FAMILY: 'redhat' - ':alpine': - OS_FAMILY: 'alpine' - OS_VERSION: '3' - ':ubuntu-12.04': - PHP_REDIS: '0' - PHP_APCU: '0' - ':debian-7': - PHP_REDIS: '0' - PHP_APCU: '0' - ':centos-7-php56': - PHP_APCU: '0' - PHP_REDIS: '0' 'php[^:]*:[0-9].[0-9]-alpine$': OS_FAMILY: 'alpine' OS_VERSION: '3' @@ -72,62 +47,3 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '10' PHP_OFFICIAL: '1' - '/liquibase': - OS_FAMILY: 'alpine' - OS_VERSION: '3' - '/certbot': - OS_FAMILY: 'alpine' - OS_VERSION: '3' - '/sphinx': - OS_FAMILY: 'alpine' - OS_VERSION: '3' - '/varnish': - OS_FAMILY: 'alpine' - OS_VERSION: '3' - '/samson-deployment': - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:3': - SOLR_VERSION: '4.10.4' - OS_FAMILY: 'arch' - OS_VERSION: '' - '/typo3-solr:4': - SOLR_VERSION: '4.10.4' - OS_FAMILY: 'arch' - OS_VERSION: '' - '/typo3-solr:5': - SOLR_VERSION: '4.10.4' - OS_FAMILY: 'arch' - OS_VERSION: '' - '/typo3-solr:6.0': - SOLR_VERSION: '6.3.0' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:6.1': - SOLR_VERSION: '6.3.0' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:6.5': - SOLR_VERSION: '6.6.2' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:7.0': - SOLR_VERSION: '6.3.0' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:7.5': - SOLR_VERSION: '6.6.2' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:8.0': - SOLR_VERSION: '6.6.2' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:8.1': - SOLR_VERSION: '6.6.3' - OS_FAMILY: 'debian' - OS_VERSION: '9' - '/typo3-solr:latest': - SOLR_VERSION: '6.6.3' - OS_FAMILY: 'debian' - OS_VERSION: '9' diff --git a/conf/diagram.yml b/conf/diagram.yml index 138b0eeba..85a43faa3 100644 --- a/conf/diagram.yml +++ b/conf/diagram.yml @@ -106,39 +106,6 @@ diagram: fillcolor: "#78c445" docker: - webdevops/php.*-dev - hhvm: - name: HHVM images - rank: 3 - styles: - graph: - style: filled - fillcolor: "#c1c3f2" - nodes: - fontname: Helvetica - shape: box - fontcolor: black - color: black - style: filled - fillcolor: "#7f84f1" - docker: - - webdevops/hhvm.* - application: - name: Application images - rank: 3 - styles: - graph: - style: filled - fillcolor: "#f2e3b5" - nodes: - fontname: Helvetica - shape: box - fontcolor: black - color: black - style: filled - fillcolor: "#e5b931" - docker: - - webdevops/typo3 - - webdevops/piwik service: name: Service images rank: 3 @@ -154,29 +121,7 @@ diagram: style: filled fillcolor: "#ffa35f" docker: - - webdevops/apache.* - - webdevops/nginx.* + - webdevops/apache + - webdevops/nginx - webdevops/ssh - webdevops/vsftp - - webdevops/postfix - - webdevops/mail-sandbox - - webdevops/varnish - - webdevops/samson-deployment - tools: - name: Tools images - rank: 3 - styles: - graph: - style: filled - fillcolor: "#c0e5a8" - nodes: - fontname: Helvetica - shape: box - fontcolor: black - color: black - style: filled - fillcolor: "#78c445" - docker: - - webdevops/sphinx - - webdevops/certbot - - webdevops/liquibase diff --git a/conf/provision.yml b/conf/provision.yml index a5f37523f..982c37886 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -13,29 +13,11 @@ provision: apache/general : '*' apache/centos : centos-* apache/alpine : alpine - apache-dev: - configuration: - apache-dev/general: '*' nginx: configuration: nginx/general : '*' nginx/centos : centos-* nginx/alpine : alpine - nginx-dev: - configuration: - nginx-dev/general : '*' - hhvm: - configuration: - hhvm/general : '*' - hhvm-apache: - configuration: - apache/general : '*' - hhvm-apache/general : '*' - hhvm-nginx: - configuration: - nginx/general : '*' - nginx/centos : centos-* - hhvm-nginx/general: '*' php: configuration: php/general : '(debian|ubuntu|centos|alpine)' @@ -75,29 +57,6 @@ provision: php/general : '*' php/official : '*' php/official-alpine: '*-alpine' - postfix: - configuration: - postfix/general : '*' - mail-sandbox: - configuration: - mail-sandbox/general: '*' vsftp: configuration: vsftp/general : '*' - typo3: - configuration: - typo3/general : '*' - piwik: - configuration: - piwik/general : '*' - varnish: - configuration: - varnish/general : '*' - liquibase: - configuration: - liquibase/general : '*' - samson-deployment: - configuration: - base/general : latest - base-app/general : latest - samson-deployment/general: latest diff --git a/docker/ansible/README.md b/docker/ansible/README.md deleted file mode 100644 index e24457e5f..000000000 --- a/docker/ansible/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# Ansible Docker container - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -Containers with Ansible pre-installed (see `webdevops/bootstrap`). -Ansible is installed via `pip` and each container will always contain the latest version of Ansible. - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/ansible:latest | [![](https://badge.imagelayers.io/webdevops/ansible:latest.svg)](https://imagelayers.io/?images=webdevops/ansible:latest 'Get your own badge on imagelayers.io') -webdevops/ansible:ubuntu-12.04 | [![](https://badge.imagelayers.io/webdevops/ansible:ubuntu-12.04.svg)](https://imagelayers.io/?images=webdevops/ansible:ubuntu-12.04 'Get your own badge on imagelayers.io') -webdevops/ansible:ubuntu-14.04 | [![](https://badge.imagelayers.io/webdevops/ansible:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/ansible:ubuntu-14.04 'Get your own badge on imagelayers.io') -webdevops/ansible:ubuntu-15.04 | [![](https://badge.imagelayers.io/webdevops/ansible:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/ansible:ubuntu-15.04 'Get your own badge on imagelayers.io') -webdevops/ansible:ubuntu-15.10 | [![](https://badge.imagelayers.io/webdevops/ansible:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/ansible:ubuntu-15.14 'Get your own badge on imagelayers.io') -webdevops/ansible:centos-7 | [![](https://badge.imagelayers.io/webdevops/ansible:centos-7.svg)](https://imagelayers.io/?images=webdevops/ansible:centos-7 'Get your own badge on imagelayers.io') -webdevops/ansible:debian-7 | [![](https://badge.imagelayers.io/webdevops/ansible:debian-7.svg)](https://imagelayers.io/?images=webdevops/ansible:debian-7 'Get your own badge on imagelayers.io') -webdevops/ansible:debian-8 | [![](https://badge.imagelayers.io/webdevops/ansible:debian-8.svg)](https://imagelayers.io/?images=webdevops/ansible:debian-8 'Get your own badge on imagelayers.io') diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile deleted file mode 100644 index 601786552..000000000 --- a/docker/ansible/alpine/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:alpine - -RUN set -x \ - # Install ansible - && apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/bin/ansible* \ - # Cleanup - && apk del python-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 deleted file mode 100644 index d11f9c10e..000000000 --- a/docker/ansible/alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "alpine") }} - -RUN set -x \ - {{ ansible.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile deleted file mode 100644 index 62cba7cd4..000000000 --- a/docker/ansible/centos-7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:centos-7 - -RUN set -x \ - # Install ansible - && yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel \ - openssh-clients \ - && easy_install pip \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/bin/ansible* \ - # Cleanup - && yum erase -y python-devel \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 5703e349c..000000000 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "centos-7") }} - -RUN set -x \ - {{ ansible.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile deleted file mode 100644 index a2be6ee10..000000000 --- a/docker/ansible/debian-7/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-7 - -RUN set -x \ - # Install ansible - && apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 7ef6b31ce..000000000 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "debian-7") }} - -RUN set -x \ - {{ ansible.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile deleted file mode 100644 index c9d29c961..000000000 --- a/docker/ansible/debian-8/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-8 - -RUN set -x \ - # Install ansible - && apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 deleted file mode 100644 index d12c259a4..000000000 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "debian-8") }} - -RUN set -x \ - {{ ansible.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile deleted file mode 100644 index 7a594f906..000000000 --- a/docker/ansible/debian-9/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-9 - -RUN set -x \ - # Install ansible - && apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 89164b59a..000000000 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "debian-9") }} - -RUN set -x \ - {{ ansible.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile deleted file mode 100644 index c4e5b9d59..000000000 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-12.04 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index d5be32a63..000000000 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile deleted file mode 100644 index bbb77a70d..000000000 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-14.04 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index e5c6701e8..000000000 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile deleted file mode 100644 index 691901e86..000000000 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-15.04 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 0558e6f27..000000000 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile deleted file mode 100644 index dd2aa7d5b..000000000 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-15.10 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 652d0057b..000000000 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile deleted file mode 100644 index f1930aa51..000000000 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-16.04 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 6ecc0c715..000000000 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile deleted file mode 100644 index ba70d8506..000000000 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-17.04 - -RUN set -x \ - # Install ansible - && apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 4a6bcf6e1..000000000 --- a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} - -RUN set -x \ - {{ ansible.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/apache-dev/README.md b/docker/apache-dev/README.md deleted file mode 100644 index a18efdd87..000000000 --- a/docker/apache-dev/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# Apache webserver Docker container - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -## Environment variables - -Variable | Description ----------------------- | ------------------------------------------------------------------------------ -`CLI_SCRIPT` | Predefined CLI script for service -`APPLICATION_UID` | PHP-FPM UID (Effective user ID) -`APPLICATION_GID` | PHP-FPM GID (Effective group ID) -`WEB_DOCUMENT_ROOT` | Document root for Apache HTTPD -`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Apache HTTPD -`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Apache HTTPD - -## Filesystem layout - -Directory | Description -------------------------------- | ------------------------------------------------------------------------------ -`/opt/docker/etc/httpd` | Apache configuration -`/opt/docker/etc/httpd/ssl` | Apache ssl configuration with example server.crt, server.csr, server.key - -File | Description ---------------------------------------------- | ------------------------------------------------------------------------------ -`/opt/docker/etc/httpd/main.conf` | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) -`/opt/docker/etc/httpd/global.conf` | Global apache configuration options -`/opt/docker/etc/httpd/conf.d/*.conf` | Global apache configuration directory (will be included) -`/opt/docker/etc/httpd/php.conf` | PHP configuration (connection to FPM) -`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included) -`/opt/docker/etc/httpd/vhost.conf` | Default vhost -`/opt/docker/etc/httpd/vhost.ssl.conf` | Default ssl configuration for vhost - - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/apache:latest | [![](https://badge.imagelayers.io/webdevops/apache:latest.svg)](https://imagelayers.io/?images=webdevops/apache:latest 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-14.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-14.04 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-15.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.04 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-15.10 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.14 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-16.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-16.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-16.04 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-16.10 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-16.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-16.14 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-17.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-17.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-17.04 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-17.10 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-17.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-17.14 'Get your own badge on imagelayers.io') -webdevops/apache:ubuntu-18.04 | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-18.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-18.04 'Get your own badge on imagelayers.io') -webdevops/apache:centos-7 | [![](https://badge.imagelayers.io/webdevops/apache:centos-7.svg)](https://imagelayers.io/?images=webdevops/apache:centos-7 'Get your own badge on imagelayers.io') -webdevops/apache:debian-7 | [![](https://badge.imagelayers.io/webdevops/apache:debian-7.svg)](https://imagelayers.io/?images=webdevops/apache:debian-7 'Get your own badge on imagelayers.io') -webdevops/apache:debian-8 | [![](https://badge.imagelayers.io/webdevops/apache:debian-8.svg)](https://imagelayers.io/?images=webdevops/apache:debian-8 'Get your own badge on imagelayers.io') -webdevops/apache:debian-9 | [![](https://badge.imagelayers.io/webdevops/apache:debian-9.svg)](https://imagelayers.io/?images=webdevops/apache:debian-9 'Get your own badge on imagelayers.io') diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile deleted file mode 100644 index a707b5c5e..000000000 --- a/docker/apache-dev/alpine/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:alpine - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 deleted file mode 100644 index 57d43de6d..000000000 --- a/docker/apache-dev/alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "alpine") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile deleted file mode 100644 index 78dc860d1..000000000 --- a/docker/apache-dev/centos-7/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:centos-7 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 3f5cf95c0..000000000 --- a/docker/apache-dev/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "centos-7") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile deleted file mode 100644 index 8bbf1842b..000000000 --- a/docker/apache-dev/debian-10/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:debian-10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/debian-10/Dockerfile.jinja2 b/docker/apache-dev/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 2fc8fb790..000000000 --- a/docker/apache-dev/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "debian-10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile deleted file mode 100644 index 417169433..000000000 --- a/docker/apache-dev/debian-7/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:debian-7 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 deleted file mode 100644 index da7813eb4..000000000 --- a/docker/apache-dev/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "debian-7") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile deleted file mode 100644 index 0cbc1c89a..000000000 --- a/docker/apache-dev/debian-8/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:debian-8 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 deleted file mode 100644 index d0d1bf868..000000000 --- a/docker/apache-dev/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "debian-8") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile deleted file mode 100644 index eb55712d2..000000000 --- a/docker/apache-dev/debian-9/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:debian-9 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 deleted file mode 100644 index a8413123e..000000000 --- a/docker/apache-dev/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "debian-9") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile deleted file mode 100644 index a89b36687..000000000 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-12.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index b5f87c92e..000000000 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-12.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile deleted file mode 100644 index 69978adbd..000000000 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-14.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 6c2a9fd10..000000000 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-14.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile deleted file mode 100644 index 9b6f4095c..000000000 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-15.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 42ccf09c2..000000000 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-15.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile deleted file mode 100644 index df4f2e029..000000000 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-15.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index dc283b259..000000000 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-15.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile deleted file mode 100644 index 87b4a71d0..000000000 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-16.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 53c1d465e..000000000 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-16.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile deleted file mode 100644 index 8e0a34bcd..000000000 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-16.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 85982e937..000000000 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-16.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile deleted file mode 100644 index 33b1d2e0b..000000000 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-17.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index d325af421..000000000 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-17.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile deleted file mode 100644 index d48b11685..000000000 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-17.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index e59968e19..000000000 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-17.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile deleted file mode 100644 index 941e3dfb6..000000000 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/apache:ubuntu-18.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index ca767b906..000000000 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("apache", "ubuntu-18.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apachedev.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile deleted file mode 100644 index 6978d398c..000000000 --- a/docker/apache/centos-7/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && yum-install \ - httpd \ - mod_ssl \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 deleted file mode 100644 index cba7ef987..000000000 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "centos-7") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 2ce73000c..000000000 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec httpd -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/centos-7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/centos-7/conf/etc/httpd/global.conf b/docker/apache/centos-7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/centos-7/conf/etc/httpd/main.conf b/docker/apache/centos-7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/php.conf b/docker/apache/centos-7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.crt b/docker/apache/centos-7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.csr b/docker/apache/centos-7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.key b/docker/apache/centos-7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.common.conf b/docker/apache/centos-7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.conf b/docker/apache/centos-7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf b/docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/centos-7/conf/etc/supervisor.d/apache.conf b/docker/apache/centos-7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/centos-7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/apache/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/apache/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile deleted file mode 100644 index b9fd0a273..000000000 --- a/docker/apache/debian-10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/debian-10/Dockerfile.jinja2 b/docker/apache/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 84d038765..000000000 --- a/docker/apache/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "debian-10") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian10() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/debian-10/conf/bin/service.d/httpd.sh b/docker/apache/debian-10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/debian-10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/debian-10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/debian-10/conf/etc/httpd/global.conf b/docker/apache/debian-10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-10/conf/etc/httpd/main.conf b/docker/apache/debian-10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/php.conf b/docker/apache/debian-10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.crt b/docker/apache/debian-10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.csr b/docker/apache/debian-10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.key b/docker/apache/debian-10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.conf b/docker/apache/debian-10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.conf b/docker/apache/debian-10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf b/docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/debian-10/conf/etc/supervisor.d/apache.conf b/docker/apache/debian-10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/debian-10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/apache/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/apache/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile deleted file mode 100644 index 2d6e23599..000000000 --- a/docker/apache/debian-7/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 563c057f0..000000000 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "debian-7") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian7() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/debian-7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/debian-7/conf/etc/httpd/global.conf b/docker/apache/debian-7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-7/conf/etc/httpd/main.conf b/docker/apache/debian-7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/php.conf b/docker/apache/debian-7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.crt b/docker/apache/debian-7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.csr b/docker/apache/debian-7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.key b/docker/apache/debian-7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.common.conf b/docker/apache/debian-7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.conf b/docker/apache/debian-7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf b/docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/debian-7/conf/etc/supervisor.d/apache.conf b/docker/apache/debian-7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/debian-7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/apache/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/apache/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile deleted file mode 100644 index 22ffd0720..000000000 --- a/docker/apache/debian-8/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 05c23a9a5..000000000 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "debian-8") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian8() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/debian-8/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/debian-8/conf/etc/httpd/global.conf b/docker/apache/debian-8/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-8/conf/etc/httpd/main.conf b/docker/apache/debian-8/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/php.conf b/docker/apache/debian-8/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.crt b/docker/apache/debian-8/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.csr b/docker/apache/debian-8/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.key b/docker/apache/debian-8/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.conf b/docker/apache/debian-8/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.conf b/docker/apache/debian-8/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf b/docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/debian-8/conf/etc/supervisor.d/apache.conf b/docker/apache/debian-8/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/debian-8/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/apache/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/apache/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile deleted file mode 100644 index 0808f4895..000000000 --- a/docker/apache/debian-9/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 deleted file mode 100644 index e66ee9f3c..000000000 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "debian-9") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/debian-9/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/debian-9/conf/etc/httpd/global.conf b/docker/apache/debian-9/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-9/conf/etc/httpd/main.conf b/docker/apache/debian-9/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/php.conf b/docker/apache/debian-9/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.crt b/docker/apache/debian-9/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.csr b/docker/apache/debian-9/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.key b/docker/apache/debian-9/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.common.conf b/docker/apache/debian-9/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.conf b/docker/apache/debian-9/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf b/docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/debian-9/conf/etc/supervisor.d/apache.conf b/docker/apache/debian-9/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/debian-9/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/apache/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/apache/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile deleted file mode 100644 index 7658551ea..000000000 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers version expires \ - && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index f0ff6eb5b..000000000 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-12.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu12() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile deleted file mode 100644 index cc8b83257..000000000 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers expires \ - && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 5f69ea7ac..000000000 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-14.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu14() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile deleted file mode 100644 index 6355df749..000000000 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 53ae8079c..000000000 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-15.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu15() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile deleted file mode 100644 index 0d3c5d063..000000000 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index dd2bf51ba..000000000 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-15.10") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/main.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile deleted file mode 100644 index 809104fc7..000000000 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 25481003b..000000000 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-16.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile deleted file mode 100644 index a1b6dab7f..000000000 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index e0665f542..000000000 --- a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-16.10") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/main.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile deleted file mode 100644 index 7a51b4a60..000000000 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 7a0ff4c89..000000000 --- a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-17.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu17() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-17.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile deleted file mode 100644 index ee1de7a75..000000000 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 53a22a864..000000000 --- a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-17.10") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu17() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-17.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/global.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/main.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/php.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile deleted file mode 100644 index da52ab023..000000000 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index d3bfc2bdc..000000000 --- a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("base", "ubuntu-18.04") }} - -{{ environment.web() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu18() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.sh b/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/apache/ubuntu-18.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/global.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/main.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/php.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt b/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr b/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key b/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf b/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf b/docker/apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh b/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh b/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile deleted file mode 100644 index 87904ce56..000000000 --- a/docker/base-app/centos-7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:centos-7 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && yum-install \ - # Install tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - bind-utils \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 09229c21b..000000000 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "centos-7") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile deleted file mode 100644 index 56fa490e2..000000000 --- a/docker/base-app/debian-10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-10 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile.jinja2 b/docker/base-app/debian-10/Dockerfile.jinja2 deleted file mode 100644 index adfaae607..000000000 --- a/docker/base-app/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "debian-10") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.debian10() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile deleted file mode 100644 index 00031457f..000000000 --- a/docker/base-app/debian-7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-7 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 452e0dabf..000000000 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "debian-7") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile deleted file mode 100644 index 116ee2a35..000000000 --- a/docker/base-app/debian-8/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-8 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 82d2a7cf3..000000000 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "debian-8") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile deleted file mode 100644 index a030db831..000000000 --- a/docker/base-app/debian-9/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-9 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 deleted file mode 100644 index e5818a7f6..000000000 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "debian-9") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/debian-9/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/debian-9/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/debian-9/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile deleted file mode 100644 index e5a33056c..000000000 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-14.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 2e162697b..000000000 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-14.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile deleted file mode 100644 index 83600e93a..000000000 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 407f9cb81..000000000 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-15.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-15.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile deleted file mode 100644 index 5a9292671..000000000 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.10 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 868be405e..000000000 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-15.10") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-15.10/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile deleted file mode 100644 index a7256d29d..000000000 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 96916b799..000000000 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-16.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-16.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile deleted file mode 100644 index ec821353e..000000000 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.10 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 1d5ae6a85..000000000 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-16.10") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-16.10/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile deleted file mode 100644 index 255558f0e..000000000 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 1bfafccfb..000000000 --- a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-17.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-17.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile deleted file mode 100644 index 1adf325f9..000000000 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.10 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index cf23e552a..000000000 --- a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-17.10") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-17.10/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile deleted file mode 100644 index 88915ce6c..000000000 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-18.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index d1495dd24..000000000 --- a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-18.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-18.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-20.04/Dockerfile b/docker/base-app/ubuntu-20.04/Dockerfile deleted file mode 100644 index 58b93f0ff..000000000 --- a/docker/base-app/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-20.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-20.04 - -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && mkdir -p /var/lib/syslog-ng/ \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/base-app/ubuntu-20.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-20.04/Dockerfile.jinja2 deleted file mode 100644 index 34d0b7862..000000000 --- a/docker/base-app/ubuntu-20.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-20.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/base-app/ubuntu-20.04/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-22.04/Dockerfile similarity index 89% rename from docker/base-app/ubuntu-12.04/Dockerfile rename to docker/base-app/ubuntu-22.04/Dockerfile index 557714ef5..134383c4a 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-22.04/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-12.04 +# Dockerfile for webdevops/base-app:ubuntu-22.04 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM webdevops/base:ubuntu-22.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-22.04/Dockerfile.jinja2 similarity index 81% rename from docker/base-app/ubuntu-12.04/Dockerfile.jinja2 rename to docker/base-app/ubuntu-22.04/Dockerfile.jinja2 index a9a9ba06d..6d988225e 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-22.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-22.04") }} {{ environment.baseApp() }} diff --git a/docker/base-app/centos-7/conf/provision/bootstrap.d/10-user-application.sh b/docker/base-app/ubuntu-22.04/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/base-app/centos-7/conf/provision/bootstrap.d/10-user-application.sh rename to docker/base-app/ubuntu-22.04/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/base-app/centos-7/conf/provision/bootstrap.d/20-app.sh b/docker/base-app/ubuntu-22.04/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/centos-7/conf/provision/bootstrap.d/20-app.sh rename to docker/base-app/ubuntu-22.04/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile deleted file mode 100644 index 75f971b25..000000000 --- a/docker/base/centos-7/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:centos-7 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && yum-install \ - supervisor \ - which \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 deleted file mode 100644 index fb5fe0aeb..000000000 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "centos-7") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/centos-7/conf/bin/service.d/cron.sh b/docker/base/centos-7/conf/bin/service.d/cron.sh deleted file mode 100644 index e99eb535a..000000000 --- a/docker/base/centos-7/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -if [[ -f /sbin/crond ]]; then - exec /sbin/crond -n $SERVICE_CRON_OPTS -else - exec /usr/sbin/crond -n $SERVICE_CRON_OPTS -fi diff --git a/docker/base/centos-7/conf/etc/cron/.gitkeep b/docker/base/centos-7/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/etc/supervisor.d/.gitkeep b/docker/base/centos-7/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/base/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/build.d/.gitkeep b/docker/base/centos-7/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/base/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/onbuild.d/.gitkeep b/docker/base/centos-7/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/roles/.gitkeep b/docker/base/centos-7/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/centos-7/conf/provision/service.d/.gitkeep b/docker/base/centos-7/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile deleted file mode 100644 index dff6726d9..000000000 --- a/docker/base/debian-10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-10 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/debian-10/Dockerfile.jinja2 b/docker/base/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 92ef7fdf9..000000000 --- a/docker/base/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "debian-10") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/debian-10/conf/VERSION b/docker/base/debian-10/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/debian-10/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/debian-10/conf/bin/bootstrap.sh b/docker/base/debian-10/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/debian-10/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/debian-10/conf/bin/config.sh b/docker/base/debian-10/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/debian-10/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/debian-10/conf/bin/control.sh b/docker/base/debian-10/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/debian-10/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-10/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/default.sh b/docker/base/debian-10/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-10/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/root.sh b/docker/base/debian-10/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/debian-10/conf/bin/entrypoint.sh b/docker/base/debian-10/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/debian-10/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/debian-10/conf/bin/provision b/docker/base/debian-10/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/debian-10/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/debian-10/conf/bin/provision.py b/docker/base/debian-10/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/debian-10/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/debian-10/conf/bin/service.d/cron.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/debian-10/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/debian-10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/debian-10/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/debian-10/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-10/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/debian-10/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/debian-10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/debian-10/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/debian-10/conf/bin/service.d/postfix.sh b/docker/base/debian-10/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/debian-10/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/debian-10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/debian-10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/debian-10/conf/bin/service.d/ssh.sh b/docker/base/debian-10/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/debian-10/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/debian-10/conf/bin/service.d/supervisor.sh b/docker/base/debian-10/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/debian-10/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/debian-10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-10/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/debian-10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/debian-10/conf/bin/service.d/syslog-ng.sh b/docker/base/debian-10/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/debian-10/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore b/docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install b/docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-cronjob b/docker/base/debian-10/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-provision b/docker/base/debian-10/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service b/docker/base/debian-10/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-10/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-10/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/debian-10/conf/bin/usr-bin/service b/docker/base/debian-10/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/debian-10/conf/bin/usr-bin/version-compare b/docker/base/debian-10/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/debian-10/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/debian-10/conf/etc/cron/.gitkeep b/docker/base/debian-10/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/etc/logrotate.d/syslog-ng b/docker/base/debian-10/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/debian-10/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/debian-10/conf/etc/supervisor.conf b/docker/base/debian-10/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/debian-10/conf/etc/supervisor.d/.gitkeep b/docker/base/debian-10/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/etc/supervisor.d/cron.conf b/docker/base/debian-10/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-10/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-10/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-10/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-10/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-10/conf/etc/supervisor.d/syslog.conf b/docker/base/debian-10/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/debian-10/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/debian-10/conf/provision/ansible.cfg b/docker/base/debian-10/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/base/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-10/conf/provision/build.d/.gitkeep b/docker/base/debian-10/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/build.d/10-cleanup.sh b/docker/base/debian-10/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/debian-10/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/base/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/debian-10/conf/provision/onbuild.d/.gitkeep b/docker/base/debian-10/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/roles/.gitkeep b/docker/base/debian-10/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/service.d/.gitkeep b/docker/base/debian-10/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-10/conf/provision/service.d/cron.sh b/docker/base/debian-10/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/debian-10/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/debian-10/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-10/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/debian-10/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/debian-10/conf/provision/service.d/postfix.sh b/docker/base/debian-10/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/debian-10/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/debian-10/conf/provision/service.d/ssh.sh b/docker/base/debian-10/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/debian-10/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/debian-10/conf/provision/service.d/syslog.sh b/docker/base/debian-10/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/debian-10/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-10/conf/provision/variables-webdevops.yml b/docker/base/debian-10/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-10/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-10/conf/provision/variables.yml b/docker/base/debian-10/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-10/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile deleted file mode 100644 index 1a48cd5b0..000000000 --- a/docker/base/debian-7/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-7 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 deleted file mode 100644 index c004fb6bf..000000000 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "debian-7") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/debian-7/conf/VERSION b/docker/base/debian-7/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/debian-7/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/debian-7/conf/bin/bootstrap.sh b/docker/base/debian-7/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/debian-7/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/debian-7/conf/bin/config.sh b/docker/base/debian-7/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/debian-7/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/base/debian-7/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/debian-7/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/default.sh b/docker/base/debian-7/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/root.sh b/docker/base/debian-7/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/debian-7/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/debian-7/conf/bin/provision b/docker/base/debian-7/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/debian-7/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/debian-7/conf/bin/provision.py b/docker/base/debian-7/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/debian-7/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/debian-7/conf/bin/service.d/cron.sh b/docker/base/debian-7/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/debian-7/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/debian-7/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-7/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/debian-7/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.sh b/docker/base/debian-7/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/debian-7/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/debian-7/conf/bin/service.d/ssh.sh b/docker/base/debian-7/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/debian-7/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/debian-7/conf/bin/service.d/supervisor.sh b/docker/base/debian-7/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/debian-7/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/debian-7/conf/bin/service.d/syslog-ng.sh b/docker/base/debian-7/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/debian-7/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore b/docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install b/docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-cronjob b/docker/base/debian-7/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-provision b/docker/base/debian-7/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service b/docker/base/debian-7/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/debian-7/conf/bin/usr-bin/service b/docker/base/debian-7/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/debian-7/conf/bin/usr-bin/version-compare b/docker/base/debian-7/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/debian-7/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/debian-7/conf/etc/cron/.gitkeep b/docker/base/debian-7/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/etc/logrotate.d/syslog-ng b/docker/base/debian-7/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/debian-7/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/base/debian-7/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/debian-7/conf/etc/supervisor.d/.gitkeep b/docker/base/debian-7/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/etc/supervisor.d/cron.conf b/docker/base/debian-7/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-7/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-7/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf b/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/debian-7/conf/provision/ansible.cfg b/docker/base/debian-7/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/base/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-7/conf/provision/build.d/.gitkeep b/docker/base/debian-7/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/build.d/10-cleanup.sh b/docker/base/debian-7/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/debian-7/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/base/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/debian-7/conf/provision/onbuild.d/.gitkeep b/docker/base/debian-7/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/roles/.gitkeep b/docker/base/debian-7/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/service.d/.gitkeep b/docker/base/debian-7/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-7/conf/provision/service.d/cron.sh b/docker/base/debian-7/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/debian-7/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/debian-7/conf/provision/service.d/postfix.sh b/docker/base/debian-7/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/debian-7/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/debian-7/conf/provision/service.d/ssh.sh b/docker/base/debian-7/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/debian-7/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/debian-7/conf/provision/service.d/syslog.sh b/docker/base/debian-7/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/debian-7/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-7/conf/provision/variables-webdevops.yml b/docker/base/debian-7/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-7/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-7/conf/provision/variables.yml b/docker/base/debian-7/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-7/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile deleted file mode 100644 index 2ff6a4938..000000000 --- a/docker/base/debian-8/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-8 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 37487ef88..000000000 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "debian-8") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/debian-8/conf/VERSION b/docker/base/debian-8/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/debian-8/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/debian-8/conf/bin/bootstrap.sh b/docker/base/debian-8/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/debian-8/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/debian-8/conf/bin/config.sh b/docker/base/debian-8/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/debian-8/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/base/debian-8/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/debian-8/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/default.sh b/docker/base/debian-8/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/root.sh b/docker/base/debian-8/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/debian-8/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/debian-8/conf/bin/provision b/docker/base/debian-8/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/debian-8/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/debian-8/conf/bin/provision.py b/docker/base/debian-8/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/debian-8/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/debian-8/conf/bin/service.d/cron.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/debian-8/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/debian-8/conf/bin/service.d/cron.sh b/docker/base/debian-8/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/debian-8/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/debian-8/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-8/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/debian-8/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/debian-8/conf/bin/service.d/postfix.sh b/docker/base/debian-8/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/debian-8/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/debian-8/conf/bin/service.d/ssh.sh b/docker/base/debian-8/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/debian-8/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/debian-8/conf/bin/service.d/supervisor.sh b/docker/base/debian-8/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/debian-8/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/debian-8/conf/bin/service.d/syslog-ng.sh b/docker/base/debian-8/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/debian-8/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore b/docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install b/docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-cronjob b/docker/base/debian-8/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-provision b/docker/base/debian-8/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service b/docker/base/debian-8/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/debian-8/conf/bin/usr-bin/service b/docker/base/debian-8/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/debian-8/conf/bin/usr-bin/version-compare b/docker/base/debian-8/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/debian-8/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/debian-8/conf/etc/cron/.gitkeep b/docker/base/debian-8/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/etc/logrotate.d/syslog-ng b/docker/base/debian-8/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/debian-8/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/base/debian-8/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/debian-8/conf/etc/supervisor.d/.gitkeep b/docker/base/debian-8/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/etc/supervisor.d/cron.conf b/docker/base/debian-8/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-8/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-8/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf b/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/debian-8/conf/provision/ansible.cfg b/docker/base/debian-8/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/base/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-8/conf/provision/build.d/.gitkeep b/docker/base/debian-8/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/build.d/10-cleanup.sh b/docker/base/debian-8/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/debian-8/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/base/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/debian-8/conf/provision/onbuild.d/.gitkeep b/docker/base/debian-8/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/roles/.gitkeep b/docker/base/debian-8/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/service.d/.gitkeep b/docker/base/debian-8/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-8/conf/provision/service.d/cron.sh b/docker/base/debian-8/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/debian-8/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/debian-8/conf/provision/service.d/postfix.sh b/docker/base/debian-8/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/debian-8/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/debian-8/conf/provision/service.d/ssh.sh b/docker/base/debian-8/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/debian-8/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/debian-8/conf/provision/service.d/syslog.sh b/docker/base/debian-8/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/debian-8/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-8/conf/provision/variables-webdevops.yml b/docker/base/debian-8/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-8/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-8/conf/provision/variables.yml b/docker/base/debian-8/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-8/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile deleted file mode 100644 index 7caa6d5ca..000000000 --- a/docker/base/debian-9/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:debian-9 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 deleted file mode 100644 index e24cf1bba..000000000 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "debian-9") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/debian-9/conf/VERSION b/docker/base/debian-9/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/debian-9/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/debian-9/conf/bin/bootstrap.sh b/docker/base/debian-9/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/debian-9/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/debian-9/conf/bin/config.sh b/docker/base/debian-9/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/debian-9/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/base/debian-9/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/debian-9/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/default.sh b/docker/base/debian-9/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/root.sh b/docker/base/debian-9/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/debian-9/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/debian-9/conf/bin/provision b/docker/base/debian-9/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/debian-9/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/debian-9/conf/bin/provision.py b/docker/base/debian-9/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/debian-9/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/debian-9/conf/bin/service.d/cron.sh b/docker/base/debian-9/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/debian-9/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/debian-9/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-9/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/debian-9/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.sh b/docker/base/debian-9/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/debian-9/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/debian-9/conf/bin/service.d/ssh.sh b/docker/base/debian-9/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/debian-9/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/debian-9/conf/bin/service.d/supervisor.sh b/docker/base/debian-9/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/debian-9/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/debian-9/conf/bin/service.d/syslog-ng.sh b/docker/base/debian-9/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/debian-9/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore b/docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install b/docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-cronjob b/docker/base/debian-9/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-provision b/docker/base/debian-9/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service b/docker/base/debian-9/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/debian-9/conf/bin/usr-bin/service b/docker/base/debian-9/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/debian-9/conf/bin/usr-bin/version-compare b/docker/base/debian-9/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/debian-9/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/debian-9/conf/etc/cron/.gitkeep b/docker/base/debian-9/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/etc/logrotate.d/syslog-ng b/docker/base/debian-9/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/debian-9/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/base/debian-9/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/debian-9/conf/etc/supervisor.d/.gitkeep b/docker/base/debian-9/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/cron.conf b/docker/base/debian-9/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-9/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-9/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf b/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/debian-9/conf/provision/ansible.cfg b/docker/base/debian-9/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/base/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-9/conf/provision/build.d/.gitkeep b/docker/base/debian-9/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/build.d/10-cleanup.sh b/docker/base/debian-9/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/debian-9/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/base/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/debian-9/conf/provision/onbuild.d/.gitkeep b/docker/base/debian-9/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/roles/.gitkeep b/docker/base/debian-9/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/service.d/.gitkeep b/docker/base/debian-9/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/debian-9/conf/provision/service.d/cron.sh b/docker/base/debian-9/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/debian-9/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/debian-9/conf/provision/service.d/postfix.sh b/docker/base/debian-9/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/debian-9/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/debian-9/conf/provision/service.d/ssh.sh b/docker/base/debian-9/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/debian-9/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/debian-9/conf/provision/service.d/syslog.sh b/docker/base/debian-9/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/debian-9/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-9/conf/provision/variables-webdevops.yml b/docker/base/debian-9/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-9/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-9/conf/provision/variables.yml b/docker/base/debian-9/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/debian-9/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-12.04/conf/VERSION b/docker/base/ubuntu-12.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-12.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-12.04/conf/bin/config.sh b/docker/base/ubuntu-12.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/base/ubuntu-12.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/provision b/docker/base/ubuntu-12.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/provision.py b/docker/base/ubuntu-12.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/service b/docker/base/ubuntu-12.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-12.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-12.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-12.04/conf/provision/ansible.cfg b/docker/base/ubuntu-12.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-12.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-12.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-12.04/conf/provision/variables.yml b/docker/base/ubuntu-12.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile deleted file mode 100644 index 74ab7c1e9..000000000 --- a/docker/base/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-14.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index a56ac9a0e..000000000 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-14.04/conf/VERSION b/docker/base/ubuntu-14.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-14.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-14.04/conf/bin/config.sh b/docker/base/ubuntu-14.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/base/ubuntu-14.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/provision b/docker/base/ubuntu-14.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/provision.py b/docker/base/ubuntu-14.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/service b/docker/base/ubuntu-14.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-14.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-14.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-14.04/conf/provision/ansible.cfg b/docker/base/ubuntu-14.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-14.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-14.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-14.04/conf/provision/variables.yml b/docker/base/ubuntu-14.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile deleted file mode 100644 index d71eaa6d0..000000000 --- a/docker/base/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-15.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 7716af57d..000000000 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-15.04/conf/VERSION b/docker/base/ubuntu-15.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-15.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-15.04/conf/bin/config.sh b/docker/base/ubuntu-15.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-15.04/conf/bin/control.sh b/docker/base/ubuntu-15.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/provision b/docker/base/ubuntu-15.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/provision.py b/docker/base/ubuntu-15.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-15.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/service b/docker/base/ubuntu-15.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-15.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-15.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-15.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-15.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-15.04/conf/provision/ansible.cfg b/docker/base/ubuntu-15.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-15.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-15.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.04/conf/provision/variables.yml b/docker/base/ubuntu-15.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile deleted file mode 100644 index 8739fe634..000000000 --- a/docker/base/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-15.10 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index e7fe320db..000000000 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-15.10/conf/VERSION b/docker/base/ubuntu-15.10/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-15.10/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-15.10/conf/bin/config.sh b/docker/base/ubuntu-15.10/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-15.10/conf/bin/control.sh b/docker/base/ubuntu-15.10/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/provision b/docker/base/ubuntu-15.10/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/provision.py b/docker/base/ubuntu-15.10/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/cron.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-15.10/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/service b/docker/base/ubuntu-15.10/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-15.10/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-15.10/conf/etc/cron/.gitkeep b/docker/base/ubuntu-15.10/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-15.10/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-15.10/conf/provision/ansible.cfg b/docker/base/ubuntu-15.10/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.10/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-15.10/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-15.10/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.10/conf/provision/variables.yml b/docker/base/ubuntu-15.10/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile deleted file mode 100644 index 0780227b0..000000000 --- a/docker/base/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-16.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 16d8d5012..000000000 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-16.04/conf/VERSION b/docker/base/ubuntu-16.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-16.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-16.04/conf/bin/config.sh b/docker/base/ubuntu-16.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-16.04/conf/bin/control.sh b/docker/base/ubuntu-16.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/provision b/docker/base/ubuntu-16.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/provision.py b/docker/base/ubuntu-16.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-16.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/service b/docker/base/ubuntu-16.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-16.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-16.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-16.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-16.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-16.04/conf/provision/ansible.cfg b/docker/base/ubuntu-16.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-16.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-16.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.04/conf/provision/variables.yml b/docker/base/ubuntu-16.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile deleted file mode 100644 index 9fab1b45e..000000000 --- a/docker/base/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-16.10 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 95bc15c40..000000000 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-16.10") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-16.10/conf/VERSION b/docker/base/ubuntu-16.10/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-16.10/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-16.10/conf/bin/config.sh b/docker/base/ubuntu-16.10/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-16.10/conf/bin/control.sh b/docker/base/ubuntu-16.10/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/provision b/docker/base/ubuntu-16.10/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/provision.py b/docker/base/ubuntu-16.10/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/cron.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-16.10/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/service b/docker/base/ubuntu-16.10/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-16.10/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-16.10/conf/etc/cron/.gitkeep b/docker/base/ubuntu-16.10/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-16.10/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-16.10/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-16.10/conf/provision/ansible.cfg b/docker/base/ubuntu-16.10/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.10/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-16.10/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-16.10/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-16.10/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.10/conf/provision/variables.yml b/docker/base/ubuntu-16.10/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile deleted file mode 100644 index 9245a8d45..000000000 --- a/docker/base/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-17.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-17.04/Dockerfile.jinja2 b/docker/base/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 61666f0d0..000000000 --- a/docker/base/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-17.04/conf/VERSION b/docker/base/ubuntu-17.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-17.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-17.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-17.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-17.04/conf/bin/config.sh b/docker/base/ubuntu-17.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-17.04/conf/bin/control.sh b/docker/base/ubuntu-17.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-17.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-17.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-17.04/conf/bin/provision b/docker/base/ubuntu-17.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-17.04/conf/bin/provision.py b/docker/base/ubuntu-17.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-17.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/service b/docker/base/ubuntu-17.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-17.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-17.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-17.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-17.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-17.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-17.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-17.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-17.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-17.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-17.04/conf/provision/ansible.cfg b/docker/base/ubuntu-17.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-17.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-17.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-17.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-17.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-17.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-17.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-17.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-17.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-17.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-17.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-17.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-17.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-17.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-17.04/conf/provision/variables.yml b/docker/base/ubuntu-17.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-17.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile deleted file mode 100644 index a0c768394..000000000 --- a/docker/base/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-17.10 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-17.10/Dockerfile.jinja2 b/docker/base/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 4e4650dac..000000000 --- a/docker/base/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-17.10") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-17.10/conf/VERSION b/docker/base/ubuntu-17.10/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-17.10/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-17.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-17.10/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-17.10/conf/bin/config.sh b/docker/base/ubuntu-17.10/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-17.10/conf/bin/control.sh b/docker/base/ubuntu-17.10/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-17.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-17.10/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-17.10/conf/bin/provision b/docker/base/ubuntu-17.10/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-17.10/conf/bin/provision.py b/docker/base/ubuntu-17.10/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/cron.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-17.10/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/service b/docker/base/ubuntu-17.10/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-17.10/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-17.10/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-17.10/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-17.10/conf/etc/cron/.gitkeep b/docker/base/ubuntu-17.10/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-17.10/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-17.10/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-17.10/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-17.10/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-17.10/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-17.10/conf/provision/ansible.cfg b/docker/base/ubuntu-17.10/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-17.10/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-17.10/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-17.10/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-17.10/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/roles/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-17.10/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-17.10/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-17.10/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-17.10/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-17.10/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-17.10/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-17.10/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-17.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-17.10/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-17.10/conf/provision/variables.yml b/docker/base/ubuntu-17.10/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-17.10/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile deleted file mode 100644 index 410d00291..000000000 --- a/docker/base/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-18.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-18.04/Dockerfile.jinja2 b/docker/base/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 8e38dfca8..000000000 --- a/docker/base/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-18.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-18.04/conf/VERSION b/docker/base/ubuntu-18.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-18.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-18.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-18.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-18.04/conf/bin/config.sh b/docker/base/ubuntu-18.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-18.04/conf/bin/control.sh b/docker/base/ubuntu-18.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-18.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-18.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-18.04/conf/bin/provision b/docker/base/ubuntu-18.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-18.04/conf/bin/provision.py b/docker/base/ubuntu-18.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-18.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/service b/docker/base/ubuntu-18.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-18.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-18.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-18.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-18.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-18.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-18.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-18.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-18.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-18.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-18.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-18.04/conf/provision/ansible.cfg b/docker/base/ubuntu-18.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-18.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-18.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-18.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-18.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-18.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-18.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-18.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-18.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-18.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-18.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-18.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-18.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-18.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-18.04/conf/provision/variables.yml b/docker/base/ubuntu-18.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-18.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-20.04/Dockerfile b/docker/base/ubuntu-20.04/Dockerfile deleted file mode 100644 index 132bfd87f..000000000 --- a/docker/base/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-20.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-20.04 - -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/base/ubuntu-20.04/Dockerfile.jinja2 b/docker/base/ubuntu-20.04/Dockerfile.jinja2 deleted file mode 100644 index d4416a1fe..000000000 --- a/docker/base/ubuntu-20.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-20.04") }} - -{{ environment.base() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ base.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/base/ubuntu-20.04/conf/VERSION b/docker/base/ubuntu-20.04/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/base/ubuntu-20.04/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/base/ubuntu-20.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-20.04/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/base/ubuntu-20.04/conf/bin/config.sh b/docker/base/ubuntu-20.04/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/base/ubuntu-20.04/conf/bin/control.sh b/docker/base/ubuntu-20.04/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/base/ubuntu-20.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-20.04/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/base/ubuntu-20.04/conf/bin/provision b/docker/base/ubuntu-20.04/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/base/ubuntu-20.04/conf/bin/provision.py b/docker/base/ubuntu-20.04/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/cron.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-20.04/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/service b/docker/base/ubuntu-20.04/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/base/ubuntu-20.04/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-20.04/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/base/ubuntu-20.04/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/base/ubuntu-20.04/conf/etc/cron/.gitkeep b/docker/base/ubuntu-20.04/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-20.04/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/.gitkeep b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-20.04/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-20.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-20.04/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/base/ubuntu-20.04/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/base/ubuntu-20.04/conf/provision/ansible.cfg b/docker/base/ubuntu-20.04/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-20.04/conf/provision/build.d/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-20.04/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/base/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-20.04/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/base/ubuntu-20.04/conf/provision/onbuild.d/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/roles/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-20.04/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-20.04/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-20.04/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-20.04/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-20.04/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/base/ubuntu-20.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-20.04/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-20.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-20.04/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-20.04/conf/provision/variables.yml b/docker/base/ubuntu-20.04/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/base/ubuntu-20.04/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-22.04/Dockerfile similarity index 86% rename from docker/base/ubuntu-12.04/Dockerfile rename to docker/base/ubuntu-22.04/Dockerfile index f0a9d9ecf..ac0736202 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-22.04/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-12.04 +# Dockerfile for webdevops/base:ubuntu-22.04 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-12.04 +FROM webdevops/bootstrap:ubuntu-22.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-22.04/Dockerfile.jinja2 similarity index 83% rename from docker/base/ubuntu-12.04/Dockerfile.jinja2 rename to docker/base/ubuntu-22.04/Dockerfile.jinja2 index a38bce572..29241a475 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-22.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} +{{ docker.from("bootstrap", "ubuntu-22.04") }} {{ environment.base() }} diff --git a/docker/base/centos-7/conf/VERSION b/docker/base/ubuntu-22.04/conf/VERSION similarity index 100% rename from docker/base/centos-7/conf/VERSION rename to docker/base/ubuntu-22.04/conf/VERSION diff --git a/docker/base/centos-7/conf/bin/bootstrap.sh b/docker/base/ubuntu-22.04/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/centos-7/conf/bin/bootstrap.sh rename to docker/base/ubuntu-22.04/conf/bin/bootstrap.sh diff --git a/docker/base/centos-7/conf/bin/config.sh b/docker/base/ubuntu-22.04/conf/bin/config.sh similarity index 100% rename from docker/base/centos-7/conf/bin/config.sh rename to docker/base/ubuntu-22.04/conf/bin/config.sh diff --git a/docker/base/centos-7/conf/bin/control.sh b/docker/base/ubuntu-22.04/conf/bin/control.sh similarity index 100% rename from docker/base/centos-7/conf/bin/control.sh rename to docker/base/ubuntu-22.04/conf/bin/control.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.d/cli.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/default.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.d/default.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.d/noop.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/root.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.d/root.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/ubuntu-22.04/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/centos-7/conf/bin/entrypoint.sh rename to docker/base/ubuntu-22.04/conf/bin/entrypoint.sh diff --git a/docker/base/centos-7/conf/bin/provision b/docker/base/ubuntu-22.04/conf/bin/provision similarity index 100% rename from docker/base/centos-7/conf/bin/provision rename to docker/base/ubuntu-22.04/conf/bin/provision diff --git a/docker/base/centos-7/conf/bin/provision.py b/docker/base/ubuntu-22.04/conf/bin/provision.py similarity index 100% rename from docker/base/centos-7/conf/bin/provision.py rename to docker/base/ubuntu-22.04/conf/bin/provision.py diff --git a/docker/base/centos-7/conf/bin/service.d/cron.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/cron.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/cron.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/cron.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/cron.sh diff --git a/docker/base/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/centos-7/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/centos-7/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/postfix.sh diff --git a/docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/centos-7/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/ssh.sh diff --git a/docker/base/centos-7/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/centos-7/conf/bin/service.d/supervisor.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/supervisor.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/supervisor.sh diff --git a/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/centos-7/conf/bin/service.d/syslog-ng.sh b/docker/base/ubuntu-22.04/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/centos-7/conf/bin/service.d/syslog-ng.sh rename to docker/base/ubuntu-22.04/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/centos-7/conf/bin/usr-bin/container-file-auto-restore b/docker/base/ubuntu-22.04/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/container-file-auto-restore rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-ansible-install b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-ansible-install rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-cronjob b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-cronjob rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-cronjob diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-provision rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-provision diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-service rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-service-disable rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/docker-service-enable rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/centos-7/conf/bin/usr-bin/service b/docker/base/ubuntu-22.04/conf/bin/usr-bin/service similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/service rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/service diff --git a/docker/base/centos-7/conf/bin/usr-bin/version-compare b/docker/base/ubuntu-22.04/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/centos-7/conf/bin/usr-bin/version-compare rename to docker/base/ubuntu-22.04/conf/bin/usr-bin/version-compare diff --git a/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/etc/cron/.gitkeep similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/etc/cron/.gitkeep diff --git a/docker/base/centos-7/conf/etc/logrotate.d/syslog-ng b/docker/base/ubuntu-22.04/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/centos-7/conf/etc/logrotate.d/syslog-ng rename to docker/base/ubuntu-22.04/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/centos-7/conf/etc/supervisor.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.conf diff --git a/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/centos-7/conf/etc/supervisor.d/cron.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/cron.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/centos-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/base/centos-7/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/centos-7/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/centos-7/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-22.04/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/syslog.conf rename to docker/base/ubuntu-22.04/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/ubuntu-22.04/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/centos-7/conf/etc/syslog-ng/syslog-ng.conf rename to docker/base/ubuntu-22.04/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/centos-7/conf/provision/ansible.cfg b/docker/base/ubuntu-22.04/conf/provision/ansible.cfg similarity index 100% rename from docker/base/centos-7/conf/provision/ansible.cfg rename to docker/base/ubuntu-22.04/conf/provision/ansible.cfg diff --git a/docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/centos-7/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/10-permissions.sh b/docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/centos-7/conf/provision/bootstrap.d/10-permissions.sh rename to docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/10-supervisor.sh b/docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/centos-7/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/base/ubuntu-22.04/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/90-cleanup.sh b/docker/base/ubuntu-22.04/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/centos-7/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/base/ubuntu-22.04/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/build.d/.gitkeep diff --git a/docker/base/centos-7/conf/provision/build.d/10-cleanup.sh b/docker/base/ubuntu-22.04/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/centos-7/conf/provision/build.d/10-cleanup.sh rename to docker/base/ubuntu-22.04/conf/provision/build.d/10-cleanup.sh diff --git a/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/centos-7/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/ubuntu-22.04/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/centos-7/conf/provision/entrypoint.d/05-permissions.sh rename to docker/base/ubuntu-22.04/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/onbuild.d/.gitkeep diff --git a/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/roles/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/roles/.gitkeep diff --git a/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/base/ubuntu-22.04/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/base/ubuntu-22.04/conf/provision/service.d/.gitkeep diff --git a/docker/base/centos-7/conf/provision/service.d/cron.sh b/docker/base/ubuntu-22.04/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/cron.sh rename to docker/base/ubuntu-22.04/conf/provision/service.d/cron.sh diff --git a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-22.04/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/dnsmasq.sh rename to docker/base/ubuntu-22.04/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/centos-7/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-22.04/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/postfix.sh rename to docker/base/ubuntu-22.04/conf/provision/service.d/postfix.sh diff --git a/docker/base/centos-7/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-22.04/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/ssh.sh rename to docker/base/ubuntu-22.04/conf/provision/service.d/ssh.sh diff --git a/docker/base/centos-7/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-22.04/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/syslog.sh rename to docker/base/ubuntu-22.04/conf/provision/service.d/syslog.sh diff --git a/docker/base/centos-7/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-22.04/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/centos-7/conf/provision/variables-webdevops.yml rename to docker/base/ubuntu-22.04/conf/provision/variables-webdevops.yml diff --git a/docker/base/centos-7/conf/provision/variables.yml b/docker/base/ubuntu-22.04/conf/provision/variables.yml similarity index 100% rename from docker/base/centos-7/conf/provision/variables.yml rename to docker/base/ubuntu-22.04/conf/provision/variables.yml diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile deleted file mode 100644 index 8d3e384c6..000000000 --- a/docker/bootstrap/centos-7/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM centos:7 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="en_US.utf8" \ - LC_ALL="en_US.utf8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # System update - && /usr/local/bin/yum-upgrade \ - && yum-install \ - epel-release \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 1acbf52f0..000000000 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("centos", "7") }} - -{{ docker.version() }} - -{{ environment.general(charset='en_US.utf8') }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile deleted file mode 100644 index fa8b3b470..000000000 --- a/docker/bootstrap/debian-10/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM debian:buster - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg diff --git a/docker/bootstrap/debian-10/Dockerfile.jinja2 b/docker/bootstrap/debian-10/Dockerfile.jinja2 deleted file mode 100644 index b11f734d5..000000000 --- a/docker/bootstrap/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ - -{{ docker.fromOfficial("debian", "buster") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.debian('buster') }} diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile deleted file mode 100644 index e2b71aee5..000000000 --- a/docker/bootstrap/debian-7/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM debian:7 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg diff --git a/docker/bootstrap/debian-7/Dockerfile.jinja2 b/docker/bootstrap/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 22ec08b93..000000000 --- a/docker/bootstrap/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ - -{{ docker.fromOfficial("debian", "7") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.debian('wheezy') }} diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile deleted file mode 100644 index 55928b256..000000000 --- a/docker/bootstrap/debian-8/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM debian:8 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg diff --git a/docker/bootstrap/debian-8/Dockerfile.jinja2 b/docker/bootstrap/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 7d71728d3..000000000 --- a/docker/bootstrap/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ - -{{ docker.fromOfficial("debian", "8") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.debian('jessie') }} diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile deleted file mode 100644 index 6b0f07426..000000000 --- a/docker/bootstrap/debian-9/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM debian:stretch - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg diff --git a/docker/bootstrap/debian-9/Dockerfile.jinja2 b/docker/bootstrap/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 093d13a5e..000000000 --- a/docker/bootstrap/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ - -{{ docker.fromOfficial("debian", "stretch") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.debian('stretch') }} diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile deleted file mode 100644 index 202de896e..000000000 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:12.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 8b9c055d2..000000000 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "12.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntuOld() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 1e0479517..000000000 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "14.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile deleted file mode 100644 index d733dd059..000000000 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:15.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 2cb91c510..000000000 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "15.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntuOld() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile deleted file mode 100644 index 4f0c293f6..000000000 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:15.10 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index f956d0e04..000000000 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "15.10") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntuOld() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile deleted file mode 100644 index 5a936c1ce..000000000 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:16.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile deleted file mode 100644 index 6952ffbb3..000000000 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:16.10 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 2a5d6b667..000000000 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "16.10") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntuOld() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile deleted file mode 100644 index 1a170c643..000000000 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:17.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - # Add multiverse - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - apt-transport-https \ - python-software-properties \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index c7372f34c..000000000 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "17.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntuOld() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile deleted file mode 100644 index f62a83787..000000000 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:17.10 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 8e0395e49..000000000 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "17.10") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile deleted file mode 100644 index ff145cedd..000000000 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:18.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 0fa56a8eb..000000000 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "18.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-20.04/Dockerfile b/docker/bootstrap/ubuntu-20.04/Dockerfile deleted file mode 100644 index 2da3d8318..000000000 --- a/docker/bootstrap/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-20.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:20.04 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Install base stuff - && apt-install \ - ca-certificates \ - apt-transport-https \ - && apt-add-repository multiverse \ - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-20.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-20.04/Dockerfile.jinja2 deleted file mode 100644 index 60d11bf84..000000000 --- a/docker/bootstrap/ubuntu-20.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "20.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-22.04/Dockerfile similarity index 92% rename from docker/bootstrap/ubuntu-14.04/Dockerfile rename to docker/bootstrap/ubuntu-22.04/Dockerfile index 585be2d4c..ab0c44fa7 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-22.04/Dockerfile @@ -1,10 +1,10 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-14.04 +# Dockerfile for webdevops/bootstrap:ubuntu-22.04 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ubuntu:14.04 +FROM ubuntu:22.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-22.04/Dockerfile.jinja2 similarity index 80% rename from docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 rename to docker/bootstrap/ubuntu-22.04/Dockerfile.jinja2 index 0c5903841..c9f9ae216 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-22.04/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("ubuntu", "16.04") }} +{{ docker.fromOfficial("ubuntu", "22.04") }} {{ docker.version() }} diff --git a/docker/certbot/README.md b/docker/certbot/README.md deleted file mode 100644 index 3978257ad..000000000 --- a/docker/certbot/README.md +++ /dev/null @@ -1,44 +0,0 @@ -# Certbot container layout - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -## Environment variables - -Variable | Description ----------------------- | ------------------------------------------------------------------------------ -`CERTBOT_EMAIL` | Email of sysadmin -`CERTBOT_DOMAIN` | Registered dns or public ip - -## USAGE - -To create or renew existing certificate -```bash -docker run -ti --rm \ - -v /etc/letsencrypt:/etc/letsencrypt \ - -v /your/document_root:/var/www \ - webdevops/certbot /usr/bin/certbot certonly \ - --agree-tos \ - --webroot \ - -w /var/www - -d webdevops.io \ - -m "webmaster@webdevops.io" -``` -See [commandline options](https://certbot.eff.org/docs/using.html#command-line-options) - -## Template a cronjob to reissue the certificate - -Create a file **/etc/cron.monthly/reissue** -```bash -#!/bin/sh -set -euo pipefail -# Certificate reissue - -docker run -ti --rm \ - -v /etc/letsencrypt:/etc/letsencrypt \ - -v /your/document_root:/var/www \ - webdevops/certbot /usr/bin/certbot renew - - ``` -make file executable : chmod +x /etc/cron.monthly/reissue - -see [Renewal](https://certbot.eff.org/docs/using.html#renewal) \ No newline at end of file diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile deleted file mode 100644 index acee06a0b..000000000 --- a/docker/certbot/latest/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/certbot:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:alpine - -VOLUME /etc/letsencrypt -VOLUME /var/www - -RUN set -x \ - && apk-install \ - gcc \ - python2-dev \ - musl-dev \ - libffi-dev \ - openssl-dev \ - py2-pip \ - && pip install --upgrade pip \ - && hash -r \ - && pip install certbot \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 deleted file mode 100644 index 7096f60cd..000000000 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,9 +0,0 @@ -{{ docker.from("bootstrap","alpine") }} - -{{ docker.volume('/etc/letsencrypt') }} -{{ docker.volume('/var/www') }} - -RUN set -x \ - {{ certbot.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 3efe10a19..52ad81edd 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-20.04 +FROM webdevops/base-app:ubuntu-22.04 RUN apt-install \ build-essential \ diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 index b48088265..ec05066b9 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 +++ b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base-app","ubuntu-20.04") }} +{{ docker.from("base-app","ubuntu-22.04") }} RUN apt-install \ build-essential \ diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile deleted file mode 100644 index e56e4364b..000000000 --- a/docker/liquibase/latest/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/liquibase:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM openjdk:8 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION="3.6.3" \ - LIQUIBASE_DRIVER="com.mysql.jdbc.Driver" \ - LIQUIBASE_CLASSPATH="/usr/share/java/mysql.jar" \ - LIQUIBASE_URL="" \ - LIQUIBASE_USERNAME="" \ - LIQUIBASE_PASSWORD="" \ - LIQUIBASE_CHANGELOG="liquibase.xml" \ - LIQUIBASE_CONTEXTS="" \ - LIQUIBASE_OPTS="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && apt-get update \ - && apt-get install -yq --no-install-recommends \ - libmariadb-java \ - && wget -q -O/tmp/liquibase.tar.gz "https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}-bin.tar.gz" \ - && mkdir -p /opt/liquibase \ - && tar -xzf /tmp/liquibase.tar.gz -C /opt/liquibase \ - && rm -f /tmp/liquibase.tar.gz \ - && chmod +x /opt/liquibase/liquibase \ - && ln -s /opt/liquibase/liquibase /usr/local/bin/ \ - && chmod +x /opt/docker/bin/entrypoint.sh \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* \ - && mkdir /liquibase \ - && ln -sf /opt/docker/bin/entrypoint.sh /entrypoint \ - # cleanup - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /liquibase -ENTRYPOINT ["/entrypoint"] - diff --git a/docker/liquibase/latest/Dockerfile.jinja2 b/docker/liquibase/latest/Dockerfile.jinja2 deleted file mode 100644 index 98e37ca63..000000000 --- a/docker/liquibase/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.fromOfficial("openjdk", "8") }} - -{{ docker.version() }} - -{{ environment.liquibase('3.6.3', 'com.mysql.jdbc.Driver', '/usr/share/java/mysql.jar') }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ liquibase.mysql() }} - -{{ docker.workdir("/liquibase") }} -{{ docker.entrypoint("/entrypoint") }} - diff --git a/docker/liquibase/latest/conf/bin/entrypoint.sh b/docker/liquibase/latest/conf/bin/entrypoint.sh deleted file mode 100644 index 3e4fc1a1a..000000000 --- a/docker/liquibase/latest/conf/bin/entrypoint.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -set -o pipefail -set -o errtrace -set -o nounset -set -o errexit - -LIQUIBASE_OPTS="$LIQUIBASE_OPTS --defaultsFile=/liquibase.properties" - -echo -n > /liquibase.properties - -## Properties file -if [[ -f liquibase.properties ]]; then - cat liquibase.properties >> /liquibase.properties -fi - -## Database driver -if [[ -n "$LIQUIBASE_DRIVER" ]]; then - sed -i '/^driver:/d' /liquibase.properties - echo "driver: ${LIQUIBASE_DRIVER}" >> /liquibase.properties -fi - -## Classpath -if [[ -n "$LIQUIBASE_CLASSPATH" ]]; then - echo "classpath: ${LIQUIBASE_CLASSPATH}" >> /liquibase.properties -fi - -## Database url -if [[ -n "$LIQUIBASE_URL" ]]; then - echo "url: ${LIQUIBASE_URL}" >> /liquibase.properties -fi - -## Database username -if [[ -n "$LIQUIBASE_USERNAME" ]]; then - echo "username: ${LIQUIBASE_USERNAME}" >> /liquibase.properties -fi - -## Database password -if [[ -n "$LIQUIBASE_PASSWORD" ]]; then - echo "password: ${LIQUIBASE_PASSWORD}" >> /liquibase.properties -fi - -## Database contexts -if [[ -n "$LIQUIBASE_CONTEXTS" ]]; then - echo "contexts: ${LIQUIBASE_CONTEXTS}" >> /liquibase.properties -fi - -## Database changelog file -if [[ -n "$LIQUIBASE_CHANGELOG" ]]; then - if ! grep -q '^changeLogFile' /liquibase.properties; then - echo "changeLogFile: ${LIQUIBASE_CHANGELOG}" >> /liquibase.properties - fi -fi - -function executeLiquibase() { - exec /opt/liquibase/liquibase $LIQUIBASE_OPTS "$@" -} - - -if [[ "$#" -ge 1 ]]; then - TASK="$1" - shift - - case "$TASK" in - ## Custom liquibase command - liquibase) - executeLiquibase "$@" - ;; - - ## Database Update Commands - update|updateCount|updateSQL|updateCountSQL) ;& - ## Database Rollback Commands - rollback|rollbackToDate|rollbackCount|rollbackSQL|rollbackToDateSQL|rollbackCountSQL|updateTestingRollback|generateChangeLog) ;& - ## Diff Commands - diff|diffChangeLog) ;& - ## Documentation Commands - dbDoc) ;& - ## Maintenance Commands - status|validate|changelogSync|changelogSyncSQL|markNextChangeSetRan|listLocks|releaseLocks|dropAll|clearCheckSums) - if [[ "$#" -eq 0 ]]; then - executeLiquibase "$TASK" - else - executeLiquibase "$TASK" "$@" - fi - ;; - - ## show configuration - showConf) - cat /liquibase.properties - ;; - - ## Help - help) - cat < Applies the next change sets. - updateSQL Writes SQL to update database to current - version to STDOUT. - updateCountSQL Writes SQL to apply the next - change sets to STDOUT. - -Database Rollback Commands -------------------------------------------------------------------------------- - rollback Rolls back the database to the state it - was in when the tag was applied. - rollbackToDate Rolls back the database to the state it - was in at the given date/time. - rollbackCount Rolls back the last change sets. - rollbackSQL Writes SQL to roll back the database to - the state it was in when the tag was - applied to STDOUT. - rollbackToDateSQL Writes SQL to roll back the database to - the state it was in at the given date/time - version to STDOUT. - rollbackCountSQL Writes SQL to roll back the last - change sets to STDOUT. - futureRollbackSQL Writes SQL to roll back the database to - the current state after the changes in - the changeslog have been applied. - updateTestingRollback Updates the database, then rolls back - changes before updating again. - generateChangeLog generateChangeLog of the database to - standard out. v1.8 requires the dataDir - parameter currently. - -Diff Commands -------------------------------------------------------------------------------- - diff [diff parameters] Writes description of differences to - standard out. - diffChangeLog [diff parameters] Writes Change Log XML to update the base - database to the target database to - standard out. - -Documentation Commands -------------------------------------------------------------------------------- - dbDoc Generates Javadoc-like documentation based - on current database and change log. - -Maintenance Commands -------------------------------------------------------------------------------- - tag "Tags" the current database state for - future rollback. - tagExists Checks whether the given tag is already - existing. - status Outputs count (list if --verbose) of unrun - change sets. - validate Checks the changelog for errors. - changelogSync Mark all changes as executed in the - database. - changelogSyncSQL Writes SQL to mark all changes as executed - in the database to STDOUT. - markNextChangeSetRan Mark the next change set as executed in - the database. - listLocks Lists who currently has locks on the - database changelog. - releaseLocks Releases all locks on the database - changelog. - dropAll Drops all database objects owned by the - user. Note that functions, procedures - and packages are not dropped - (limitation in 1.8.1). - clearCheckSums Removes current checksums from database. - On next run checksums will be recomputed. -EOF - exit 1 - ;; - - ## Default task (eg. sh, bash) - *) - exec "$TASK" "$@" - ;; - esac -fi diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile deleted file mode 100644 index a2d11d00e..000000000 --- a/docker/liquibase/mysql/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/liquibase:mysql -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM openjdk:8 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION="3.6.3" \ - LIQUIBASE_DRIVER="org.mariadb.jdbc.Driver" \ - LIQUIBASE_CLASSPATH="/usr/share/java/mariadb-java-client.jar" \ - LIQUIBASE_URL="" \ - LIQUIBASE_USERNAME="" \ - LIQUIBASE_PASSWORD="" \ - LIQUIBASE_CHANGELOG="liquibase.xml" \ - LIQUIBASE_CONTEXTS="" \ - LIQUIBASE_OPTS="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && apt-get update \ - && apt-get install -yq --no-install-recommends \ - libmariadb-java \ - && wget -q -O/tmp/liquibase.tar.gz "https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}-bin.tar.gz" \ - && mkdir -p /opt/liquibase \ - && tar -xzf /tmp/liquibase.tar.gz -C /opt/liquibase \ - && rm -f /tmp/liquibase.tar.gz \ - && chmod +x /opt/liquibase/liquibase \ - && ln -s /opt/liquibase/liquibase /usr/local/bin/ \ - && chmod +x /opt/docker/bin/entrypoint.sh \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* \ - && mkdir /liquibase \ - && ln -sf /opt/docker/bin/entrypoint.sh /entrypoint \ - # cleanup - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /liquibase -ENTRYPOINT ["/entrypoint"] - diff --git a/docker/liquibase/mysql/Dockerfile.jinja2 b/docker/liquibase/mysql/Dockerfile.jinja2 deleted file mode 100644 index 2ce99e8d1..000000000 --- a/docker/liquibase/mysql/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.fromOfficial("openjdk", "8") }} - -{{ docker.version() }} - -{{ environment.liquibase('3.6.3', 'org.mariadb.jdbc.Driver', '/usr/share/java/mariadb-java-client.jar') }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ liquibase.mysql() }} - -{{ docker.workdir("/liquibase") }} -{{ docker.entrypoint("/entrypoint") }} - diff --git a/docker/liquibase/mysql/conf/bin/entrypoint.sh b/docker/liquibase/mysql/conf/bin/entrypoint.sh deleted file mode 100644 index 3e4fc1a1a..000000000 --- a/docker/liquibase/mysql/conf/bin/entrypoint.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -set -o pipefail -set -o errtrace -set -o nounset -set -o errexit - -LIQUIBASE_OPTS="$LIQUIBASE_OPTS --defaultsFile=/liquibase.properties" - -echo -n > /liquibase.properties - -## Properties file -if [[ -f liquibase.properties ]]; then - cat liquibase.properties >> /liquibase.properties -fi - -## Database driver -if [[ -n "$LIQUIBASE_DRIVER" ]]; then - sed -i '/^driver:/d' /liquibase.properties - echo "driver: ${LIQUIBASE_DRIVER}" >> /liquibase.properties -fi - -## Classpath -if [[ -n "$LIQUIBASE_CLASSPATH" ]]; then - echo "classpath: ${LIQUIBASE_CLASSPATH}" >> /liquibase.properties -fi - -## Database url -if [[ -n "$LIQUIBASE_URL" ]]; then - echo "url: ${LIQUIBASE_URL}" >> /liquibase.properties -fi - -## Database username -if [[ -n "$LIQUIBASE_USERNAME" ]]; then - echo "username: ${LIQUIBASE_USERNAME}" >> /liquibase.properties -fi - -## Database password -if [[ -n "$LIQUIBASE_PASSWORD" ]]; then - echo "password: ${LIQUIBASE_PASSWORD}" >> /liquibase.properties -fi - -## Database contexts -if [[ -n "$LIQUIBASE_CONTEXTS" ]]; then - echo "contexts: ${LIQUIBASE_CONTEXTS}" >> /liquibase.properties -fi - -## Database changelog file -if [[ -n "$LIQUIBASE_CHANGELOG" ]]; then - if ! grep -q '^changeLogFile' /liquibase.properties; then - echo "changeLogFile: ${LIQUIBASE_CHANGELOG}" >> /liquibase.properties - fi -fi - -function executeLiquibase() { - exec /opt/liquibase/liquibase $LIQUIBASE_OPTS "$@" -} - - -if [[ "$#" -ge 1 ]]; then - TASK="$1" - shift - - case "$TASK" in - ## Custom liquibase command - liquibase) - executeLiquibase "$@" - ;; - - ## Database Update Commands - update|updateCount|updateSQL|updateCountSQL) ;& - ## Database Rollback Commands - rollback|rollbackToDate|rollbackCount|rollbackSQL|rollbackToDateSQL|rollbackCountSQL|updateTestingRollback|generateChangeLog) ;& - ## Diff Commands - diff|diffChangeLog) ;& - ## Documentation Commands - dbDoc) ;& - ## Maintenance Commands - status|validate|changelogSync|changelogSyncSQL|markNextChangeSetRan|listLocks|releaseLocks|dropAll|clearCheckSums) - if [[ "$#" -eq 0 ]]; then - executeLiquibase "$TASK" - else - executeLiquibase "$TASK" "$@" - fi - ;; - - ## show configuration - showConf) - cat /liquibase.properties - ;; - - ## Help - help) - cat < Applies the next change sets. - updateSQL Writes SQL to update database to current - version to STDOUT. - updateCountSQL Writes SQL to apply the next - change sets to STDOUT. - -Database Rollback Commands -------------------------------------------------------------------------------- - rollback Rolls back the database to the state it - was in when the tag was applied. - rollbackToDate Rolls back the database to the state it - was in at the given date/time. - rollbackCount Rolls back the last change sets. - rollbackSQL Writes SQL to roll back the database to - the state it was in when the tag was - applied to STDOUT. - rollbackToDateSQL Writes SQL to roll back the database to - the state it was in at the given date/time - version to STDOUT. - rollbackCountSQL Writes SQL to roll back the last - change sets to STDOUT. - futureRollbackSQL Writes SQL to roll back the database to - the current state after the changes in - the changeslog have been applied. - updateTestingRollback Updates the database, then rolls back - changes before updating again. - generateChangeLog generateChangeLog of the database to - standard out. v1.8 requires the dataDir - parameter currently. - -Diff Commands -------------------------------------------------------------------------------- - diff [diff parameters] Writes description of differences to - standard out. - diffChangeLog [diff parameters] Writes Change Log XML to update the base - database to the target database to - standard out. - -Documentation Commands -------------------------------------------------------------------------------- - dbDoc Generates Javadoc-like documentation based - on current database and change log. - -Maintenance Commands -------------------------------------------------------------------------------- - tag "Tags" the current database state for - future rollback. - tagExists Checks whether the given tag is already - existing. - status Outputs count (list if --verbose) of unrun - change sets. - validate Checks the changelog for errors. - changelogSync Mark all changes as executed in the - database. - changelogSyncSQL Writes SQL to mark all changes as executed - in the database to STDOUT. - markNextChangeSetRan Mark the next change set as executed in - the database. - listLocks Lists who currently has locks on the - database changelog. - releaseLocks Releases all locks on the database - changelog. - dropAll Drops all database objects owned by the - user. Note that functions, procedures - and packages are not dropped - (limitation in 1.8.1). - clearCheckSums Removes current checksums from database. - On next run checksums will be recomputed. -EOF - exit 1 - ;; - - ## Default task (eg. sh, bash) - *) - exec "$TASK" "$@" - ;; - esac -fi diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile deleted file mode 100644 index 0d3fb9344..000000000 --- a/docker/liquibase/postgres/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/liquibase:postgres -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM openjdk:8 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION="3.6.3" \ - LIQUIBASE_DRIVER="org.postgresql.Driver" \ - LIQUIBASE_CLASSPATH="/usr/share/java/postgresql.jar" \ - LIQUIBASE_URL="" \ - LIQUIBASE_USERNAME="" \ - LIQUIBASE_PASSWORD="" \ - LIQUIBASE_CHANGELOG="liquibase.xml" \ - LIQUIBASE_CONTEXTS="" \ - LIQUIBASE_OPTS="" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && apt-get update \ - && apt-get install -yq --no-install-recommends \ - libpostgresql-jdbc-java \ - && wget -q -O/tmp/liquibase.tar.gz "https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}-bin.tar.gz" \ - && mkdir -p /opt/liquibase \ - && tar -xzf /tmp/liquibase.tar.gz -C /opt/liquibase \ - && rm -f /tmp/liquibase.tar.gz \ - && chmod +x /opt/liquibase/liquibase \ - && ln -s /opt/liquibase/liquibase /usr/local/bin/ \ - && chmod +x /opt/docker/bin/entrypoint.sh \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* \ - && mkdir /liquibase \ - && ln -sf /opt/docker/bin/entrypoint.sh /entrypoint \ - # cleanup - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /liquibase -ENTRYPOINT ["/entrypoint"] - diff --git a/docker/liquibase/postgres/Dockerfile.jinja2 b/docker/liquibase/postgres/Dockerfile.jinja2 deleted file mode 100644 index 135bec47a..000000000 --- a/docker/liquibase/postgres/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.fromOfficial("openjdk", "8") }} - -{{ docker.version() }} - -{{ environment.liquibase('3.6.3', 'org.postgresql.Driver', '/usr/share/java/postgresql.jar') }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ liquibase.postgres() }} - -{{ docker.workdir("/liquibase") }} -{{ docker.entrypoint("/entrypoint") }} - diff --git a/docker/liquibase/postgres/conf/bin/entrypoint.sh b/docker/liquibase/postgres/conf/bin/entrypoint.sh deleted file mode 100644 index 3e4fc1a1a..000000000 --- a/docker/liquibase/postgres/conf/bin/entrypoint.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -set -o pipefail -set -o errtrace -set -o nounset -set -o errexit - -LIQUIBASE_OPTS="$LIQUIBASE_OPTS --defaultsFile=/liquibase.properties" - -echo -n > /liquibase.properties - -## Properties file -if [[ -f liquibase.properties ]]; then - cat liquibase.properties >> /liquibase.properties -fi - -## Database driver -if [[ -n "$LIQUIBASE_DRIVER" ]]; then - sed -i '/^driver:/d' /liquibase.properties - echo "driver: ${LIQUIBASE_DRIVER}" >> /liquibase.properties -fi - -## Classpath -if [[ -n "$LIQUIBASE_CLASSPATH" ]]; then - echo "classpath: ${LIQUIBASE_CLASSPATH}" >> /liquibase.properties -fi - -## Database url -if [[ -n "$LIQUIBASE_URL" ]]; then - echo "url: ${LIQUIBASE_URL}" >> /liquibase.properties -fi - -## Database username -if [[ -n "$LIQUIBASE_USERNAME" ]]; then - echo "username: ${LIQUIBASE_USERNAME}" >> /liquibase.properties -fi - -## Database password -if [[ -n "$LIQUIBASE_PASSWORD" ]]; then - echo "password: ${LIQUIBASE_PASSWORD}" >> /liquibase.properties -fi - -## Database contexts -if [[ -n "$LIQUIBASE_CONTEXTS" ]]; then - echo "contexts: ${LIQUIBASE_CONTEXTS}" >> /liquibase.properties -fi - -## Database changelog file -if [[ -n "$LIQUIBASE_CHANGELOG" ]]; then - if ! grep -q '^changeLogFile' /liquibase.properties; then - echo "changeLogFile: ${LIQUIBASE_CHANGELOG}" >> /liquibase.properties - fi -fi - -function executeLiquibase() { - exec /opt/liquibase/liquibase $LIQUIBASE_OPTS "$@" -} - - -if [[ "$#" -ge 1 ]]; then - TASK="$1" - shift - - case "$TASK" in - ## Custom liquibase command - liquibase) - executeLiquibase "$@" - ;; - - ## Database Update Commands - update|updateCount|updateSQL|updateCountSQL) ;& - ## Database Rollback Commands - rollback|rollbackToDate|rollbackCount|rollbackSQL|rollbackToDateSQL|rollbackCountSQL|updateTestingRollback|generateChangeLog) ;& - ## Diff Commands - diff|diffChangeLog) ;& - ## Documentation Commands - dbDoc) ;& - ## Maintenance Commands - status|validate|changelogSync|changelogSyncSQL|markNextChangeSetRan|listLocks|releaseLocks|dropAll|clearCheckSums) - if [[ "$#" -eq 0 ]]; then - executeLiquibase "$TASK" - else - executeLiquibase "$TASK" "$@" - fi - ;; - - ## show configuration - showConf) - cat /liquibase.properties - ;; - - ## Help - help) - cat < Applies the next change sets. - updateSQL Writes SQL to update database to current - version to STDOUT. - updateCountSQL Writes SQL to apply the next - change sets to STDOUT. - -Database Rollback Commands -------------------------------------------------------------------------------- - rollback Rolls back the database to the state it - was in when the tag was applied. - rollbackToDate Rolls back the database to the state it - was in at the given date/time. - rollbackCount Rolls back the last change sets. - rollbackSQL Writes SQL to roll back the database to - the state it was in when the tag was - applied to STDOUT. - rollbackToDateSQL Writes SQL to roll back the database to - the state it was in at the given date/time - version to STDOUT. - rollbackCountSQL Writes SQL to roll back the last - change sets to STDOUT. - futureRollbackSQL Writes SQL to roll back the database to - the current state after the changes in - the changeslog have been applied. - updateTestingRollback Updates the database, then rolls back - changes before updating again. - generateChangeLog generateChangeLog of the database to - standard out. v1.8 requires the dataDir - parameter currently. - -Diff Commands -------------------------------------------------------------------------------- - diff [diff parameters] Writes description of differences to - standard out. - diffChangeLog [diff parameters] Writes Change Log XML to update the base - database to the target database to - standard out. - -Documentation Commands -------------------------------------------------------------------------------- - dbDoc Generates Javadoc-like documentation based - on current database and change log. - -Maintenance Commands -------------------------------------------------------------------------------- - tag "Tags" the current database state for - future rollback. - tagExists Checks whether the given tag is already - existing. - status Outputs count (list if --verbose) of unrun - change sets. - validate Checks the changelog for errors. - changelogSync Mark all changes as executed in the - database. - changelogSyncSQL Writes SQL to mark all changes as executed - in the database to STDOUT. - markNextChangeSetRan Mark the next change set as executed in - the database. - listLocks Lists who currently has locks on the - database changelog. - releaseLocks Releases all locks on the database - changelog. - dropAll Drops all database objects owned by the - user. Note that functions, procedures - and packages are not dropped - (limitation in 1.8.1). - clearCheckSums Removes current checksums from database. - On next run checksums will be recomputed. -EOF - exit 1 - ;; - - ## Default task (eg. sh, bash) - *) - exec "$TASK" "$@" - ;; - esac -fi diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile deleted file mode 100644 index 237cc8067..000000000 --- a/docker/liquidsoap/latest/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/liquidsoap:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:latest - -# Install services -RUN /usr/local/bin/apt-install \ - liquidsoap \ - liquidsoap-plugin-all \ - mplayer \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - && docker-run-bootstrap \ - && docker-image-cleanup - -ENV LIQUIDSOAP_USER "liquidsoap" -ENV LIQUIDSOAP_TELNET "1" - -ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" -ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" - -ENV LIQUIDSOAP_STREAM_INPUT "http://icecast:8000/live" - -ENV LIQUIDSOAP_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" - -ENV LIQUIDSOAP_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" -ENV LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE "4h-2h" - -ENV LIQUIDSOAP_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" -ENV LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE "2h-14h" - -ENV LIQUIDSOAP_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" - -ENV LIQUIDSOAP_META_NAME "Liquidsoap Docker" -ENV LIQUIDSOAP_META_GENRE "" -ENV LIQUIDSOAP_META_URL "" -ENV LIQUIDSOAP_META_DESCRIPTION "" - -COPY conf/ /opt/docker/ - -CMD ["liquidsoap"] - -EXPOSE 1234 diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 deleted file mode 100644 index 897b4433c..000000000 --- a/docker/liquidsoap/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,40 +0,0 @@ -{{ docker.from("base","latest") }} - -# Install services -RUN /usr/local/bin/apt-install \ - liquidsoap \ - liquidsoap-plugin-all \ - mplayer \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -ENV LIQUIDSOAP_USER "liquidsoap" -ENV LIQUIDSOAP_TELNET "1" - -ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" -ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" - -ENV LIQUIDSOAP_STREAM_INPUT "http://icecast:8000/live" - -ENV LIQUIDSOAP_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" - -ENV LIQUIDSOAP_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" -ENV LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE "4h-2h" - -ENV LIQUIDSOAP_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" -ENV LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE "2h-14h" - -ENV LIQUIDSOAP_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" - -ENV LIQUIDSOAP_META_NAME "Liquidsoap Docker" -ENV LIQUIDSOAP_META_GENRE "" -ENV LIQUIDSOAP_META_URL "" -ENV LIQUIDSOAP_META_DESCRIPTION "" - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.cmd("liquidsoap") }} - -{{ docker.expose('1234') }} diff --git a/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh b/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh deleted file mode 100644 index 1fd1ea972..000000000 --- a/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Configure and run liquidsoap -############################################# - -if [[ -n "$LIQUIDSOAP_TEMPLATE" ]]; then - go-replace --mode=template -- "$LIQUIDSOAP_TEMPLATE" -fi - -exec gosu "$LIQUIDSOAP_USER" liquidsoap "$LIQUIDSOAP_SCRIPT" diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq deleted file mode 100644 index c848c1e4d..000000000 --- a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/liquidsoap - -# Lines starting with # are comments, they are ignored. - -# Log path -set("log.file.path","/dev/null") - -# Print log messages to the console, -# can also be done by passing the -v option to liquidsoap. -set("log.stdout", true) - -# Use the telnet server for requests -{{if .Env.LIQUIDSOAP_TELNET}} -set("server.telnet", true) -{{else}} -set("server.telnet", false) -{{end}} - -################## -# Settings -################## - -DJ_stream = "{{.Env.LIQUIDSOAP_STREAM_INPUT}}" - -PLAYLIST_default = {{.Env.LIQUIDSOAP_PLAYLIST_DEFAULT}} -PLAYLIST_day = {{.Env.LIQUIDSOAP_PLAYLIST_DAY}} -PLAYLIST_night = {{.Env.LIQUIDSOAP_PLAYLIST_NIGHT}} - -META_name = "{{.Env.LIQUIDSOAP_META_NAME}}" -META_genre = "{{.Env.LIQUIDSOAP_META_GENRE}}" -META_url = "{{.Env.LIQUIDSOAP_META_URL}}" -META_desc = "{{.Env.LIQUIDSOAP_META_DESCRIPTION}}" - -## fetch dj stream -DJ_input = input.http(DJ_stream) - -## fadeout dj -#DJ_input = fade.out(merge_tracks(DJ_input)) - -# Play user requests if there are any, -# otherwise one of our playlists, -# and the default file if anything goes wrong. -PLAYLIST_input = fallback([ - switch([({ {{.Env.LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE}} }, PLAYLIST_day), - ({ {{.Env.LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE}} }, PLAYLIST_night)]), - PLAYLIST_default -]) - -## add fade -PLAYLIST_input = smart_crossfade(fade_out=0.5, fade_in=0.5, PLAYLIST_input) - -## set title -PLAYLIST_input = rewrite_metadata( - [ - ("title", "$(title)"), - ("comment", "{{.Env.LIQUIDSOAP_META_URL}}") - ], - PLAYLIST_input -) - -# Add the ability to relay live shows -ALL_input = fallback(track_sensitive=false, [DJ_input, PLAYLIST_input]) - -################# -# Output -################# - -{{.Env.LIQUIDSOAP_OUTPUT}} -{{.Env.LIQUIDSOAP_OUTPUT_1}} -{{.Env.LIQUIDSOAP_OUTPUT_2}} -{{.Env.LIQUIDSOAP_OUTPUT_3}} -{{.Env.LIQUIDSOAP_OUTPUT_4}} -{{.Env.LIQUIDSOAP_OUTPUT_5}} -{{.Env.LIQUIDSOAP_OUTPUT_6}} -{{.Env.LIQUIDSOAP_OUTPUT_7}} -{{.Env.LIQUIDSOAP_OUTPUT_8}} -{{.Env.LIQUIDSOAP_OUTPUT_9}} -{{.Env.LIQUIDSOAP_OUTPUT_10}} -{{.Env.LIQUIDSOAP_OUTPUT_11}} -{{.Env.LIQUIDSOAP_OUTPUT_12}} -{{.Env.LIQUIDSOAP_OUTPUT_13}} -{{.Env.LIQUIDSOAP_OUTPUT_14}} -{{.Env.LIQUIDSOAP_OUTPUT_15}} -{{.Env.LIQUIDSOAP_OUTPUT_16}} -{{.Env.LIQUIDSOAP_OUTPUT_17}} -{{.Env.LIQUIDSOAP_OUTPUT_18}} -{{.Env.LIQUIDSOAP_OUTPUT_19}} -{{.Env.LIQUIDSOAP_OUTPUT_20}} diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 deleted file mode 100644 index c8a0bf931602f48521a36f8d52f61eb1b124a293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4409 zcmeH}zfQw25XL_kSddWZz=q_luvD&7!W`Q2Pb7_~7se{F+Cbz=O-jYed+;U<9e5K) z9-`Q!Em8+6XXt`&axVAt-F@d+xoJDQPk>QmWf&#n~s1l%EA|ub|b*IkiZV^0O1_#}HAA~M!^TKIvj-hlFQ)GKxX6yOk z#d+|ofO7^M6#7MiP)0I6A!}9vtAJI&Dqt1( zcM8luD>K#f&bvY9nyHmw)USwPp6YC3$UqnOW(aBKqXhG1%v5J{L*}O;Q%E [ - 'verify_peer' => false, - 'verify_peer_name' => false, - 'allow_self_signed' => true, - ], -]; -$config['default_port'] = 143; -$config['smtp_port'] = 25; -$config['smtp_user'] = '%u'; -$config['smtp_pass'] = '%p'; - -$config['plugins'][] = 'webdevops_autologin'; diff --git a/docker/mail-sandbox/latest/conf/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php b/docker/mail-sandbox/latest/conf/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php deleted file mode 100644 index 97fbd5859..000000000 --- a/docker/mail-sandbox/latest/conf/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php +++ /dev/null @@ -1,32 +0,0 @@ -add_hook('startup', array($this, 'startup')); - $this->add_hook('authenticate', array($this, 'authenticate')); - } - - function startup($args) - { - // change action to login - if (empty($_SESSION['user_id'])) { - $args['action'] = 'login'; - } - - return $args; - } - - function authenticate($args) { - $args['user'] = getenv('MAILBOX_USERNAME'); - $args['pass'] = getenv('MAILBOX_PASSWORD'); - $args['host'] = 'localhost'; - $args['cookiecheck'] = false; - $args['valid'] = true; - - return $args; - } -} diff --git a/docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf b/docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf deleted file mode 100644 index 26ae256b1..000000000 --- a/docker/mail-sandbox/latest/conf/etc/supervisor.d/dovecot.conf +++ /dev/null @@ -1,10 +0,0 @@ -[group:dovecot] -programs=dovecotd -priority=20 - -[program:dovecotd] -command = /opt/docker/bin/service.d/dovecot.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true diff --git a/docker/mail-sandbox/latest/conf/provision/bootstrap.d/.gitkeep b/docker/mail-sandbox/latest/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-dovecot.sh b/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-dovecot.sh deleted file mode 100644 index 43fc1df22..000000000 --- a/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-dovecot.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# Setup local configuration -ln -sf /opt/docker/etc/dovecot/local.conf /etc/dovecot/local.conf diff --git a/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-postfix.sh b/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-postfix.sh deleted file mode 100644 index a84b55dff..000000000 --- a/docker/mail-sandbox/latest/conf/provision/bootstrap.d/20-postfix.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Create empty recipient_canonical_maps -touch /etc/postfix/recipient_canonical_maps - -# Configuration -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*smtpd_banner[\s]*=' -r 'smtpd_banner = myhostname ESMTP' \ - -s '^[\s#]*inet_interfaces[\s]*=' -r 'inet_interfaces = all' \ - -s '^[\s#]*inet_protocols[\s]*=' -r 'inet_protocols = ipv4' \ - -s '^[\s#]*home_mailbox[\s]*=' -r 'home_mailbox = .mail/' \ - -s '^[\s#]*mynetworks[\s]*=' -r 'mynetworks = 127.0.0.0/8 [::1]/128 0.0.0.0/0 [::1]/0' \ - -s '^[\s#]*mydestination[\s]*=' -r 'mydestination = localhost' \ - -s '^[\s#]*message_size_limit[\s]*=' -r 'message_size_limit = 102400000' \ - -s '^[\s#]*recipient_canonical_maps[\s]*=' -r 'recipient_canonical_maps = regexp:/etc/postfix/recipient_canonical_maps' \ - -- /etc/postfix/main.cf - -# Setup listening on port 1025 -echo "1025 inet n - y - - smtpd" >> /etc/postfix/master.cf diff --git a/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-mail-sandbox.sh b/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-mail-sandbox.sh deleted file mode 100644 index 06747a628..000000000 --- a/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-mail-sandbox.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -if ! id -u "$MAILBOX_USERNAME" > /dev/null 2>&1; then - # Add group - groupadd "$MAILBOX_USERNAME" - - # Add user - useradd --create-home --shell /bin/bash --no-user-group "$MAILBOX_USERNAME" - - # Assign user to group - usermod -g "$MAILBOX_USERNAME" "$MAILBOX_USERNAME" -fi - -# Set passwords -echo "$MAILBOX_USERNAME":"$MAILBOX_PASSWORD" | chpasswd - -# Create mailbox -mkdir -p -- \ - "~${MAILBOX_USERNAME}" \ - "~${MAILBOX_USERNAME}/.mail" \ - "~${MAILBOX_USERNAME}/.mail/Archive" \ - "~${MAILBOX_USERNAME}/.mail/Drafts" \ - "~${MAILBOX_USERNAME}/.mail/Sent" \ - "~${MAILBOX_USERNAME}/.mail/Spam" \ - "~${MAILBOX_USERNAME}/.mail/Tash" - -# Fix permissions -chown -R "${MAILBOX_USERNAME}:${MAILBOX_USERNAME}" -- "~${MAILBOX_USERNAME}" diff --git a/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-postfix.sh b/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-postfix.sh deleted file mode 100644 index 31dd03bdb..000000000 --- a/docker/mail-sandbox/latest/conf/provision/entrypoint.d/20-postfix.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# setup mailname -hostname > /etc/mailname - -# Create recipient_canonical_maps (redirect mails to local sandbox) -echo "/^.*$/ ${MAILBOX_USERNAME}@localhost" > /etc/postfix/recipient_canonical_maps -chown root:root /etc/postfix/recipient_canonical_maps -chmod 0644 /etc/postfix/recipient_canonical_maps -postmap /etc/postfix/recipient_canonical_maps diff --git a/docker/nginx-dev/README.md b/docker/nginx-dev/README.md deleted file mode 100644 index d9adaf7a8..000000000 --- a/docker/nginx-dev/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# Nginx webserver Docker container - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -Container | Distribution name ------------------------------------ | ------------------- -`webdevops/nginx:ubuntu-12.04` | precise -`webdevops/nginx:ubuntu-14.04` | trusty (LTS) -`webdevops/nginx:ubuntu-15.04` | vivid -`webdevops/nginx:ubuntu-15.10` | wily -`webdevops/nginx:debian-7` | wheezy -`webdevops/nginx:debian-8` | jessie -`webdevops/nginx:centos-7` | - - -## Environment variables - -Variable | Description ----------------------- | ------------------------------------------------------------------------------ -`CLI_SCRIPT` | Predefined CLI script for service -`APPLICATION_UID` | PHP-FPM UID (Effective user ID) -`APPLICATION_GID` | PHP-FPM GID (Effective group ID) -`WEB_DOCUMENT_ROOT` | Document root for Nginx -`WEB_DOCUMENT_INDEX` | Document index (eg. `index.php`) for Nginx -`WEB_ALIAS_DOMAIN` | Alias domains (eg. `*.vm`) for Nginx - -## Filesystem layout - -Directory | Description -------------------------------- | ------------------------------------------------------------------------------ -`/opt/docker/etc/nginx` | Nginx configuration -`/opt/docker/etc/nginx/ssl` | Nginx ssl configuration with example server.crt, server.csr, server.key - -File | Description ---------------------------------------------- | ------------------------------------------------------------------------------ -`/opt/docker/etc/nginx/main.conf` | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) -`/opt/docker/etc/nginx/global.conf` | Global nginx configuration options -`/opt/docker/etc/nginx/conf.d/*.conf` | Global apache configuration directory (will be included) -`/opt/docker/etc/nginx/php.conf` | PHP configuration (connection to FPM) -`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included) -`/opt/docker/etc/nginx/vhost.conf` | Default vhost -`/opt/docker/etc/nginx/vhost.ssl.conf` | Default ssl configuration for vhost - - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/nginx:latest | [![](https://badge.imagelayers.io/webdevops/nginx:latest.svg)](https://imagelayers.io/?images=webdevops/nginx:latest 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-14.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-14.04 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-15.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.04 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-15.10 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.14 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-16.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-16.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-16.04 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-16.10 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-16.10.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-16.14 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-17.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-17.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-17.04 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-17.10 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-17.10.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-17.14 'Get your own badge on imagelayers.io') -webdevops/nginx:ubuntu-18.04 | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-18.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-18.04 'Get your own badge on imagelayers.io') -webdevops/nginx:centos-7 | [![](https://badge.imagelayers.io/webdevops/nginx:centos-7.svg)](https://imagelayers.io/?images=webdevops/nginx:centos-7 'Get your own badge on imagelayers.io') -webdevops/nginx:debian-7 | [![](https://badge.imagelayers.io/webdevops/nginx:debian-7.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-7 'Get your own badge on imagelayers.io') -webdevops/nginx:debian-8 | [![](https://badge.imagelayers.io/webdevops/nginx:debian-8.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-8 'Get your own badge on imagelayers.io') -webdevops/nginx:debian-9 | [![](https://badge.imagelayers.io/webdevops/nginx:debian-9.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-9 'Get your own badge on imagelayers.io') diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile deleted file mode 100644 index 566b4d7c7..000000000 --- a/docker/nginx-dev/alpine/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:alpine - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 deleted file mode 100644 index 8f52c5b94..000000000 --- a/docker/nginx-dev/alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "alpine") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/alpine/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile deleted file mode 100644 index a673b3511..000000000 --- a/docker/nginx-dev/centos-7/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:centos-7 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 2d8e5c132..000000000 --- a/docker/nginx-dev/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "centos-7") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile deleted file mode 100644 index 2d25a5abc..000000000 --- a/docker/nginx-dev/debian-10/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:debian-10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-10/Dockerfile.jinja2 b/docker/nginx-dev/debian-10/Dockerfile.jinja2 deleted file mode 100644 index f37f1ea7d..000000000 --- a/docker/nginx-dev/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "debian-10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile deleted file mode 100644 index 1428b820d..000000000 --- a/docker/nginx-dev/debian-7/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:debian-7 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 93312e20a..000000000 --- a/docker/nginx-dev/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "debian-7") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile deleted file mode 100644 index b246149e8..000000000 --- a/docker/nginx-dev/debian-8/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:debian-8 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 49ce203dc..000000000 --- a/docker/nginx-dev/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "debian-8") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile deleted file mode 100644 index ae8d42a78..000000000 --- a/docker/nginx-dev/debian-9/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:debian-9 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 51d446f92..000000000 --- a/docker/nginx-dev/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "debian-9") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile deleted file mode 100644 index 1a243c9fc..000000000 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-12.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 971727ada..000000000 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-12.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile deleted file mode 100644 index 9065f3404..000000000 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-14.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index da04d9517..000000000 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-14.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile deleted file mode 100644 index afbe221a8..000000000 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-15.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 7a21ddd99..000000000 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-15.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile deleted file mode 100644 index 7be31c871..000000000 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-15.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 73633cffd..000000000 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-15.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile deleted file mode 100644 index 14318b16c..000000000 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-16.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 2d43c04b1..000000000 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-16.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile deleted file mode 100644 index 82ea50f4e..000000000 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-16.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index cfb579db6..000000000 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-16.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile deleted file mode 100644 index be1263480..000000000 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-17.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 91c5cb8d0..000000000 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-17.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile deleted file mode 100644 index 386e2f7ae..000000000 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-17.10 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index d4ac06702..000000000 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-17.10") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile deleted file mode 100644 index c6bb51b8e..000000000 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/nginx:ubuntu-18.04 - -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 366236b5e..000000000 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("nginx", "ubuntu-18.04") }} - -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile deleted file mode 100644 index e212ff808..000000000 --- a/docker/nginx/centos-7/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install tools - && yum-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 961199bb4..000000000 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "centos-7") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/centos-7/conf/etc/nginx/global.conf b/docker/nginx/centos-7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/centos-7/conf/etc/nginx/main.conf b/docker/nginx/centos-7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/centos-7/conf/etc/nginx/nginx.conf b/docker/nginx/centos-7/conf/etc/nginx/nginx.conf deleted file mode 100644 index 8321e7021..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/nginx/centos-7/conf/etc/nginx/php.conf b/docker/nginx/centos-7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.crt b/docker/nginx/centos-7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.csr b/docker/nginx/centos-7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.key b/docker/nginx/centos-7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/centos-7/conf/etc/supervisor.d/nginx.conf b/docker/nginx/centos-7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/centos-7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile deleted file mode 100644 index 61bbdf3bb..000000000 --- a/docker/nginx/debian-10/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/debian-10/Dockerfile.jinja2 b/docker/nginx/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 76014601d..000000000 --- a/docker/nginx/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "debian-10") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/debian-10/conf/bin/service.d/nginx.sh b/docker/nginx/debian-10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/debian-10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/debian-10/conf/etc/nginx/global.conf b/docker/nginx/debian-10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-10/conf/etc/nginx/main.conf b/docker/nginx/debian-10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/debian-10/conf/etc/nginx/php.conf b/docker/nginx/debian-10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.crt b/docker/nginx/debian-10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.csr b/docker/nginx/debian-10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.key b/docker/nginx/debian-10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/debian-10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/debian-10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/debian-10/conf/etc/supervisor.d/nginx.conf b/docker/nginx/debian-10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/debian-10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile deleted file mode 100644 index 8662e4532..000000000 --- a/docker/nginx/debian-7/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 deleted file mode 100644 index abb19cad8..000000000 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "debian-7") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/debian-7/conf/etc/nginx/global.conf b/docker/nginx/debian-7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-7/conf/etc/nginx/main.conf b/docker/nginx/debian-7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/debian-7/conf/etc/nginx/php.conf b/docker/nginx/debian-7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.crt b/docker/nginx/debian-7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.csr b/docker/nginx/debian-7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.key b/docker/nginx/debian-7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/debian-7/conf/etc/supervisor.d/nginx.conf b/docker/nginx/debian-7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/debian-7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile deleted file mode 100644 index ac11cbda8..000000000 --- a/docker/nginx/debian-8/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 546cadc59..000000000 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "debian-8") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/debian-8/conf/etc/nginx/global.conf b/docker/nginx/debian-8/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-8/conf/etc/nginx/main.conf b/docker/nginx/debian-8/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/debian-8/conf/etc/nginx/php.conf b/docker/nginx/debian-8/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.crt b/docker/nginx/debian-8/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.csr b/docker/nginx/debian-8/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.key b/docker/nginx/debian-8/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/debian-8/conf/etc/supervisor.d/nginx.conf b/docker/nginx/debian-8/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/debian-8/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile deleted file mode 100644 index 3a1e9be84..000000000 --- a/docker/nginx/debian-9/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 57ddf2971..000000000 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "debian-9") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/debian-9/conf/etc/nginx/global.conf b/docker/nginx/debian-9/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-9/conf/etc/nginx/main.conf b/docker/nginx/debian-9/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/debian-9/conf/etc/nginx/php.conf b/docker/nginx/debian-9/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.crt b/docker/nginx/debian-9/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.csr b/docker/nginx/debian-9/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.key b/docker/nginx/debian-9/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/debian-9/conf/etc/supervisor.d/nginx.conf b/docker/nginx/debian-9/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/debian-9/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile deleted file mode 100644 index 891e6e55f..000000000 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 58d8dc0ba..000000000 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile deleted file mode 100644 index 6971cbe75..000000000 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index df578015a..000000000 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile deleted file mode 100644 index 6b7050f59..000000000 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 7e7341d27..000000000 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile deleted file mode 100644 index 82068fc9e..000000000 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 26a4d4448..000000000 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile deleted file mode 100644 index a0da6bc41..000000000 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 867a3badb..000000000 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile deleted file mode 100644 index 4fe5e074c..000000000 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 4b0dfd55a..000000000 --- a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile deleted file mode 100644 index 72490a06f..000000000 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 4ef4cc124..000000000 --- a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile deleted file mode 100644 index c7519ce21..000000000 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index bfaa2244c..000000000 --- a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile deleted file mode 100644 index d3ffb08f0..000000000 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 0dba66880..000000000 --- a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh b/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/global.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/main.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/php.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt b/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr b/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key b/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf b/docker/nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile deleted file mode 100644 index 79cf3428b..000000000 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:centos-7-php56 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php56w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index 44ea7caac..000000000 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "centos-7-php56") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile deleted file mode 100644 index a9d6ddff7..000000000 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:centos-7-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php70w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index 27dbed6ff..000000000 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "centos-7-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile deleted file mode 100644 index 52fc8a51f..000000000 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 deleted file mode 100644 index ad9dce5e8..000000000 --- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "centos-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile deleted file mode 100644 index 13f3ae66c..000000000 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile.jinja2 b/docker/php-apache-dev/debian-10/Dockerfile.jinja2 deleted file mode 100644 index d2aa7ac07..000000000 --- a/docker/php-apache-dev/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "debian-10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile deleted file mode 100644 index bffdc9062..000000000 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 45691eea9..000000000 --- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "debian-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile deleted file mode 100644 index c40c6886b..000000000 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:debian-8-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php7.0-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index ac68d986d..000000000 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "debian-8-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debianSury() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile deleted file mode 100644 index ebbe4275d..000000000 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 1bd854db3..000000000 --- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "debian-8") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile deleted file mode 100644 index 6f29afbaa..000000000 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 31212501c..000000000 --- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "debian-9") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile deleted file mode 100644 index 521505f8a..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index f8e123a67..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile deleted file mode 100644 index 0a4cb38c6..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 4ae062d4e..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile deleted file mode 100644 index e6433856c..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 3a15b19e5..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile deleted file mode 100644 index b612158d8..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 5edba2b22..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile deleted file mode 100644 index 90a86b386..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index ca1f2e7ad..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile deleted file mode 100644 index f86a3d697..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index a0079f7af..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile deleted file mode 100644 index ccbdde509..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 261d0531b..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile deleted file mode 100644 index ab75db046..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 090334b15..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile deleted file mode 100644 index bee2acdcd..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 09a315ffb..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile deleted file mode 100644 index 9b8c54aa4..000000000 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php56 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && yum-install \ - httpd \ - mod_ssl \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index 0fee44954..000000000 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "centos-7-php56") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh b/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh deleted file mode 100644 index 2ce73000c..000000000 --- a/docker/php-apache/centos-7-php56/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec httpd -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key b/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf b/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/centos-7-php56/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/centos-7-php56/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/centos-7-php56/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile deleted file mode 100644 index 00ccd90bc..000000000 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && yum-install \ - httpd \ - mod_ssl \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index 662be2fcf..000000000 --- a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "centos-7-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.sh b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 2ce73000c..000000000 --- a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec httpd -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/global.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/main.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/php.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.key b/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/centos-7-php7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/centos-7-php7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/centos-7-php7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/centos-7-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/centos-7-php7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile deleted file mode 100644 index 2b9a4dc7c..000000000 --- a/docker/php-apache/centos-7/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && yum-install \ - httpd \ - mod_ssl \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 deleted file mode 100644 index 1d0c9c421..000000000 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "centos-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 2ce73000c..000000000 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec httpd -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/centos-7/conf/etc/httpd/global.conf b/docker/php-apache/centos-7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7/conf/etc/httpd/main.conf b/docker/php-apache/centos-7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/centos-7/conf/etc/httpd/php.conf b/docker/php-apache/centos-7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.key b/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/centos-7/conf/etc/httpd/vhost.conf b/docker/php-apache/centos-7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/centos-7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/centos-7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/centos-7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/centos-7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/centos-7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/centos-7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/centos-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/centos-7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/centos-7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/centos-7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile deleted file mode 100644 index de913be0f..000000000 --- a/docker/php-apache/debian-10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/debian-10/Dockerfile.jinja2 b/docker/php-apache/debian-10/Dockerfile.jinja2 deleted file mode 100644 index ed56ca48a..000000000 --- a/docker/php-apache/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "debian-10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian10() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/debian-10/conf/bin/service.d/httpd.sh b/docker/php-apache/debian-10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/debian-10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/debian-10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/debian-10/conf/etc/httpd/global.conf b/docker/php-apache/debian-10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-10/conf/etc/httpd/main.conf b/docker/php-apache/debian-10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/debian-10/conf/etc/httpd/php.conf b/docker/php-apache/debian-10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.crt b/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.csr b/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.key b/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.conf b/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/debian-10/conf/etc/httpd/vhost.conf b/docker/php-apache/debian-10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/debian-10/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/debian-10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/debian-10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/debian-10/conf/etc/supervisor.d/apache.conf b/docker/php-apache/debian-10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/debian-10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/debian-10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-10/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/debian-10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/debian-10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile deleted file mode 100644 index 9c1c8b31a..000000000 --- a/docker/php-apache/debian-7/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 34c188bdf..000000000 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "debian-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian7() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/debian-7/conf/etc/httpd/global.conf b/docker/php-apache/debian-7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-7/conf/etc/httpd/main.conf b/docker/php-apache/debian-7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/debian-7/conf/etc/httpd/php.conf b/docker/php-apache/debian-7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.key b/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/debian-7/conf/etc/httpd/vhost.conf b/docker/php-apache/debian-7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/debian-7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/debian-7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/debian-7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/debian-7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/debian-7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/debian-7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/debian-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/debian-7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/debian-7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile deleted file mode 100644 index 09ab61bf5..000000000 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index dd4392727..000000000 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "debian-8-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian8() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/global.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/main.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/php.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.key b/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/debian-8-php7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/debian-8-php7/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/debian-8-php7/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/debian-8-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/debian-8-php7/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile deleted file mode 100644 index b52a2175a..000000000 --- a/docker/php-apache/debian-8/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 86ddfa3b7..000000000 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "debian-8") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian8() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/debian-8/conf/etc/httpd/global.conf b/docker/php-apache/debian-8/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-8/conf/etc/httpd/main.conf b/docker/php-apache/debian-8/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/debian-8/conf/etc/httpd/php.conf b/docker/php-apache/debian-8/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.crt b/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.csr b/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.key b/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.conf b/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/debian-8/conf/etc/httpd/vhost.conf b/docker/php-apache/debian-8/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/debian-8/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/debian-8/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/debian-8/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/debian-8/conf/etc/supervisor.d/apache.conf b/docker/php-apache/debian-8/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/debian-8/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/debian-8/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-8/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/debian-8/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/debian-8/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile deleted file mode 100644 index 734d0d02e..000000000 --- a/docker/php-apache/debian-9/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 deleted file mode 100644 index ea8031e86..000000000 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "debian-9") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/debian-9/conf/etc/httpd/global.conf b/docker/php-apache/debian-9/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-9/conf/etc/httpd/main.conf b/docker/php-apache/debian-9/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/debian-9/conf/etc/httpd/php.conf b/docker/php-apache/debian-9/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.crt b/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.csr b/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.key b/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.conf b/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/debian-9/conf/etc/httpd/vhost.conf b/docker/php-apache/debian-9/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/debian-9/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/debian-9/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/debian-9/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/debian-9/conf/etc/supervisor.d/apache.conf b/docker/php-apache/debian-9/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/debian-9/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/debian-9/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/debian-9/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/debian-9/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/debian-9/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile deleted file mode 100644 index c7a6721a5..000000000 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers version expires \ - && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index c14199870..000000000 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu12() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile deleted file mode 100644 index 84fccd722..000000000 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - apache2-mpm-worker \ - libapache2-mod-fastcgi \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions fastcgi ssl rewrite headers expires \ - && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 36fba97b0..000000000 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu14() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-14.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile deleted file mode 100644 index 138411e39..000000000 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index e90c50e36..000000000 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu15() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-15.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile deleted file mode 100644 index e06e72579..000000000 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index 72f309781..000000000 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-15.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile deleted file mode 100644 index 651e01312..000000000 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 7439946f1..000000000 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-16.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile deleted file mode 100644 index d925aa216..000000000 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 294b0e545..000000000 --- a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-16.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile deleted file mode 100644 index f1e61b697..000000000 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 819accab9..000000000 --- a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-17.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile deleted file mode 100644 index 3bf5c65b6..000000000 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index be9266856..000000000 --- a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-17.10/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile deleted file mode 100644 index 592c8f887..000000000 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 42a00a2d1..000000000 --- a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.ubuntu16() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.sh b/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/global.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/main.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/php.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/ubuntu-18.04/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-dev/alpine b/docker/php-dev/alpine deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-dev/alpine +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-dev/alpine-3 b/docker/php-dev/alpine-3 deleted file mode 120000 index a84cfe247..000000000 --- a/docker/php-dev/alpine-3 +++ /dev/null @@ -1 +0,0 @@ -alpine-php5 \ No newline at end of file diff --git a/docker/php-dev/alpine-3-php7 b/docker/php-dev/alpine-3-php7 deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-dev/alpine-3-php7 +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile deleted file mode 100644 index 688e2cee3..000000000 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php56 - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php56w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index e039c4ec6..000000000 --- a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "centos-7-php56") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/centos-7-php56/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile deleted file mode 100644 index 70a319bbf..000000000 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php7 - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php70w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index ce1e84eff..000000000 --- a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "centos-7-php7") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/centos-7-php7/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/centos-7-php7/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/centos-7-php7/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile deleted file mode 100644 index 3332c014c..000000000 --- a/docker/php-dev/centos-7/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile.jinja2 b/docker/php-dev/centos-7/Dockerfile.jinja2 deleted file mode 100644 index bf30efd47..000000000 --- a/docker/php-dev/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "centos-7") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/centos-7/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/centos-7/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/centos-7/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile deleted file mode 100644 index 229a4ad67..000000000 --- a/docker/php-dev/debian-10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-10 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile.jinja2 b/docker/php-dev/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 68c8e7f6c..000000000 --- a/docker/php-dev/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "debian-10") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/debian-10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/debian-10/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/debian-10/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/debian-10/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile deleted file mode 100644 index c18141949..000000000 --- a/docker/php-dev/debian-7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-7 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile.jinja2 b/docker/php-dev/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 08ddcc85a..000000000 --- a/docker/php-dev/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "debian-7") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/debian-7/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/debian-7/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/debian-7/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile deleted file mode 100644 index d3c526994..000000000 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8-php7 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php7.0-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index 05ef2ed1f..000000000 --- a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "debian-8-php7") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debianSury() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/debian-8-php7/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile deleted file mode 100644 index 28279c0ac..000000000 --- a/docker/php-dev/debian-8/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile.jinja2 b/docker/php-dev/debian-8/Dockerfile.jinja2 deleted file mode 100644 index b668f7401..000000000 --- a/docker/php-dev/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "debian-8") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/debian-8/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/debian-8/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/debian-8/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile deleted file mode 100644 index bd9842099..000000000 --- a/docker/php-dev/debian-9/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-9 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile.jinja2 b/docker/php-dev/debian-9/Dockerfile.jinja2 deleted file mode 100644 index b1f16cece..000000000 --- a/docker/php-dev/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "debian-9") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/debian-9/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/debian-9/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/debian-9/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile deleted file mode 100644 index d121f5c46..000000000 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-12.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 119ce01e3..000000000 --- a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-12.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile deleted file mode 100644 index 2cbd914d9..000000000 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-14.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index 78bea4553..000000000 --- a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-14.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile deleted file mode 100644 index 2bc17f4ea..000000000 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 43f9b2d82..000000000 --- a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-15.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile deleted file mode 100644 index 1071eb532..000000000 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.10 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index f0f76b8dc..000000000 --- a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-15.10") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile deleted file mode 100644 index 5397df672..000000000 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 31260dbf8..000000000 --- a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-16.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile deleted file mode 100644 index c839b5005..000000000 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.10 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 23bb414f5..000000000 --- a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-16.10") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-16.10/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile deleted file mode 100644 index a8eedfc41..000000000 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 68e0f22b1..000000000 --- a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-17.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-17.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile deleted file mode 100644 index f9ffc2105..000000000 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.10 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 0c0bd6853..000000000 --- a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-17.10") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-17.10/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile deleted file mode 100644 index 92308e997..000000000 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-18.04 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index f868ff2ff..000000000 --- a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "ubuntu-18.04") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/ubuntu-18.04/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/alpine b/docker/php-nginx-dev/alpine deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-nginx-dev/alpine +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine-3 b/docker/php-nginx-dev/alpine-3 deleted file mode 120000 index a84cfe247..000000000 --- a/docker/php-nginx-dev/alpine-3 +++ /dev/null @@ -1 +0,0 @@ -alpine-php5 \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine-3-php7 b/docker/php-nginx-dev/alpine-3-php7 deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-nginx-dev/alpine-3-php7 +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile deleted file mode 100644 index 9e628f253..000000000 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:centos-7-php56 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php56w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index d10622c83..000000000 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "centos-7-php56") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile deleted file mode 100644 index 200f890eb..000000000 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:centos-7-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php70w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index da776eb1d..000000000 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "centos-7-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.webtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile deleted file mode 100644 index 958178e90..000000000 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 deleted file mode 100644 index fc7be71dd..000000000 --- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "centos-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile deleted file mode 100644 index 1c894dbe3..000000000 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 deleted file mode 100644 index e7cdf3877..000000000 --- a/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "debian-10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/debian-10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile deleted file mode 100644 index 5f9a3234a..000000000 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup - diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 deleted file mode 100644 index a6f338d13..000000000 --- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php-nginx", "debian-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile deleted file mode 100644 index 802408826..000000000 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:debian-8-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php7.0-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index 933d504c8..000000000 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "debian-8-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debianSury() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile deleted file mode 100644 index d6d8a1eae..000000000 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 deleted file mode 100644 index 06fb289d5..000000000 --- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "debian-8") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/debian-8/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile deleted file mode 100644 index 46deccdcc..000000000 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 deleted file mode 100644 index 723e808fe..000000000 --- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "debian-9") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/debian-9/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile deleted file mode 100644 index d4fb27a40..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup - diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 46addf4c2..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile deleted file mode 100644 index 88f1a2589..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index e29677227..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile deleted file mode 100644 index 17e52c8f6..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index e0354aec2..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile deleted file mode 100644 index 5270614f7..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index f4e112c9f..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile deleted file mode 100644 index b5967e002..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 5c6afad71..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile deleted file mode 100644 index 124549f78..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 5775f6282..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile deleted file mode 100644 index fa3d5d7ef..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 211fc59e8..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile deleted file mode 100644 index 868f5bf6e..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index f06d9f88b..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile deleted file mode 100644 index 500ff3bcd..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 3a7acc84f..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7dev.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx/alpine b/docker/php-nginx/alpine deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-nginx/alpine +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx/alpine-3 b/docker/php-nginx/alpine-3 deleted file mode 120000 index a84cfe247..000000000 --- a/docker/php-nginx/alpine-3 +++ /dev/null @@ -1 +0,0 @@ -alpine-php5 \ No newline at end of file diff --git a/docker/php-nginx/alpine-3-php7 b/docker/php-nginx/alpine-3-php7 deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php-nginx/alpine-3-php7 +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile deleted file mode 100644 index 826f5fd51..000000000 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php56 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install tools - && yum-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index a478b9c38..000000000 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "centos-7-php56") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/centos-7-php56/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf deleted file mode 100644 index 8321e7021..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/centos-7-php56/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/centos-7-php56/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile deleted file mode 100644 index 036e4e150..000000000 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install tools - && yum-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index 36931d172..000000000 --- a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "centos-7-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/nginx.conf deleted file mode 100644 index 8321e7021..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7-php7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/centos-7-php7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/centos-7-php7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile deleted file mode 100644 index 0be8bf753..000000000 --- a/docker/php-nginx/centos-7/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install tools - && yum-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 deleted file mode 100644 index cf6399370..000000000 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "centos-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/global.conf b/docker/php-nginx/centos-7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/main.conf b/docker/php-nginx/centos-7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/nginx.conf b/docker/php-nginx/centos-7/conf/etc/nginx/nginx.conf deleted file mode 100644 index 8321e7021..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/php.conf b/docker/php-nginx/centos-7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.key b/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/centos-7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/centos-7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/centos-7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile deleted file mode 100644 index fe02deade..000000000 --- a/docker/php-nginx/debian-10/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/debian-10/Dockerfile.jinja2 b/docker/php-nginx/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 117abb6c7..000000000 --- a/docker/php-nginx/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "debian-10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/debian-10/conf/bin/service.d/nginx.sh b/docker/php-nginx/debian-10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/debian-10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/debian-10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/global.conf b/docker/php-nginx/debian-10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/main.conf b/docker/php-nginx/debian-10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/php.conf b/docker/php-nginx/debian-10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.key b/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/debian-10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/debian-10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/debian-10/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/debian-10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/debian-10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile deleted file mode 100644 index 6a36e4414..000000000 --- a/docker/php-nginx/debian-7/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 6d1327571..000000000 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "debian-7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/global.conf b/docker/php-nginx/debian-7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/main.conf b/docker/php-nginx/debian-7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/php.conf b/docker/php-nginx/debian-7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.key b/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/debian-7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/debian-7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/debian-7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile deleted file mode 100644 index 8d67a4595..000000000 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8-php7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index 2cd5d9326..000000000 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "debian-8-php7") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/global.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/main.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/php.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.key b/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/debian-8-php7/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/debian-8-php7/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/debian-8-php7/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile deleted file mode 100644 index 33767d6bf..000000000 --- a/docker/php-nginx/debian-8/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 deleted file mode 100644 index bc075df69..000000000 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "debian-8") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/global.conf b/docker/php-nginx/debian-8/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/main.conf b/docker/php-nginx/debian-8/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/php.conf b/docker/php-nginx/debian-8/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.key b/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/debian-8/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/debian-8/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/debian-8/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile deleted file mode 100644 index e2b0311cc..000000000 --- a/docker/php-nginx/debian-9/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 deleted file mode 100644 index cbcddf811..000000000 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "debian-9") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/global.conf b/docker/php-nginx/debian-9/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/main.conf b/docker/php-nginx/debian-9/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/php.conf b/docker/php-nginx/debian-9/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.key b/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/debian-9/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/debian-9/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/debian-9/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile deleted file mode 100644 index 60fee0b4d..000000000 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 893418fa5..000000000 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile deleted file mode 100644 index 648f6baa1..000000000 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index a55c4827d..000000000 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile deleted file mode 100644 index 5342b4d7d..000000000 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index 2a6a21cc7..000000000 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile deleted file mode 100644 index ec8108e43..000000000 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index fb951871c..000000000 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile deleted file mode 100644 index 6dd1e9c7b..000000000 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 22b062520..000000000 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile deleted file mode 100644 index 41f28c3df..000000000 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 5d3edb8f0..000000000 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-16.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile deleted file mode 100644 index 435561ec6..000000000 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index 032a9934b..000000000 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-17.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile deleted file mode 100644 index 612b33846..000000000 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 6d11cd573..000000000 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-17.10/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile deleted file mode 100644 index 8a583738b..000000000 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 5a32a47aa..000000000 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-18.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/ubuntu-20.04/Dockerfile b/docker/php-nginx/ubuntu-20.04/Dockerfile deleted file mode 100644 index f0f63c5d8..000000000 --- a/docker/php-nginx/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:ubuntu-20.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:ubuntu-20.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-20.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-20.04/Dockerfile.jinja2 deleted file mode 100644 index 42bdd7966..000000000 --- a/docker/php-nginx/ubuntu-20.04/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "ubuntu-20.04") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/global.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/main.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/php.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.key b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.conf deleted file mode 100644 index 109fbb31b..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 default_server; - listen [::]:443 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,7 +0,0 @@ -ssl on; -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/ubuntu-20.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/ubuntu-20.04/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/ubuntu-20.04/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php/alpine b/docker/php/alpine deleted file mode 120000 index a5e678cb6..000000000 --- a/docker/php/alpine +++ /dev/null @@ -1 +0,0 @@ -alpine-php7 \ No newline at end of file diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile deleted file mode 100644 index 283970fb5..000000000 --- a/docker/php/centos-7-php56/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:centos-7-php56 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ - && yum-install \ - ImageMagick \ - GraphicsMagick \ - ghostscript \ - php56w-cli \ - php56w-fpm \ - php56w-common \ - php56w-intl \ - php56w-imap \ - php56w-mysqlnd \ - php56w-pecl-memcached \ - php56w-mongodb \ - php56w-mcrypt \ - php56w-gd \ - php56w-pgsql \ - php56w-mbstring \ - php56w-bcmath \ - php56w-soap \ - sqlite \ - php56w-xmlrpc \ - php56w-xml \ - geoip \ - php56w-ldap \ - ImageMagick-devel \ - ImageMagick-perl \ - php56w-pear \ - php56w-devel \ - gcc \ - make \ - php56w-opcache \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && sed -i "$ s|\-n||g" /usr/bin/pecl \ - && pecl install imagick \ - # && pecl install redis \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Cleanup - && yum erase -y php-devel gcc \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/centos-7-php56/Dockerfile.jinja2 b/docker/php/centos-7-php56/Dockerfile.jinja2 deleted file mode 100644 index f5c767356..000000000 --- a/docker/php/centos-7-php56/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "centos-7") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.centosWebtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/centos-7-php56/conf/bin/usr-bin/docker-php-setting b/docker/php/centos-7-php56/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/centos-7-php56/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm b/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/centos-7-php56/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep b/docker/php/centos-7-php56/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php56/conf/etc/php/fpm/.gitkeep b/docker/php/centos-7-php56/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php56/conf/etc/php/php.ini b/docker/php/centos-7-php56/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/centos-7-php56/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini b/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/centos-7-php56/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf b/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/centos-7-php56/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/centos-7-php56/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/centos-7-php56/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/centos-7-php56/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/centos-7-php56/conf/provision/entrypoint.d/.gitkeep b/docker/php/centos-7-php56/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile deleted file mode 100644 index 2f1302db3..000000000 --- a/docker/php/centos-7-php7/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:centos-7-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ - && yum-install \ - ImageMagick \ - GraphicsMagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-utils \ - optipng \ - pngcrush \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php70w-cli \ - php70w-fpm \ - php70w-common \ - php70w-intl \ - php70w-imap \ - php70w-mysqlnd \ - php70w-pecl-memcached \ - php70w-mcrypt \ - php70w-gd \ - php70w-pgsql \ - php70w-mbstring \ - php70w-bcmath \ - php70w-soap \ - php70w-pecl-apcu \ - sqlite \ - php70w-xmlrpc \ - php70w-xml \ - geoip \ - php70w-ldap \ - ImageMagick-devel \ - ImageMagick-perl \ - php70w-pear \ - php70w-devel \ - gcc \ - make \ - php70w-opcache \ - php70w-pecl-imagick \ - php70w-pecl-mongodb \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - && pecl install redis \ - && echo "extension=redis.so" > /etc/php.d/redis.ini \ - && yum remove -y ImageMagick-devel php70w-devel gcc make \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile.jinja2 b/docker/php/centos-7-php7/Dockerfile.jinja2 deleted file mode 100644 index 3b1e51e02..000000000 --- a/docker/php/centos-7-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "centos-7") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.centosWebtatic() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/centos-7-php7/conf/bin/usr-bin/docker-php-setting b/docker/php/centos-7-php7/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/centos-7-php7/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/centos-7-php7/conf/etc/logrotate.d/php5-fpm b/docker/php/centos-7-php7/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/centos-7-php7/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/centos-7-php7/conf/etc/php/conf.d/.gitkeep b/docker/php/centos-7-php7/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php7/conf/etc/php/fpm/.gitkeep b/docker/php/centos-7-php7/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php7/conf/etc/php/php.ini b/docker/php/centos-7-php7/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/centos-7-php7/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini b/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/centos-7-php7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/centos-7-php7/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/centos-7-php7/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/centos-7-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/centos-7-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/centos-7-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/centos-7-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php/centos-7-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile deleted file mode 100644 index eec9aff56..000000000 --- a/docker/php/centos-7/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:centos-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:centos-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && yum-install \ - # Install tools - ImageMagick \ - GraphicsMagick \ - ghostscript \ - # Install php (cli/fpm) - php-cli \ - php-fpm \ - php-json \ - php-intl \ - php-imap \ - php-curl \ - php-mysqlnd \ - php-mongodb \ - php-memcached \ - php-mcrypt \ - php-gd \ - php-pgsql \ - php-mbstring \ - php-bcmath \ - php-soap \ - sqlite \ - php-xmlrpc \ - php-xsl \ - geoip \ - php-ldap \ - php-memcache \ - php-pecl-redis \ - ImageMagick \ - ImageMagick-devel \ - ImageMagick-perl \ - php-pear \ - php-pecl-apcu \ - php-devel \ - gcc \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && pecl install imagick \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Cleanup - && yum erase -y php-devel gcc \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile.jinja2 b/docker/php/centos-7/Dockerfile.jinja2 deleted file mode 100644 index f36ae87f7..000000000 --- a/docker/php/centos-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "centos-7") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.centos() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/centos-7/conf/bin/usr-bin/docker-php-setting b/docker/php/centos-7/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/centos-7/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/centos-7/conf/etc/logrotate.d/php5-fpm b/docker/php/centos-7/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/centos-7/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/centos-7/conf/etc/php/conf.d/.gitkeep b/docker/php/centos-7/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7/conf/etc/php/fpm/.gitkeep b/docker/php/centos-7/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7/conf/etc/php/php.ini b/docker/php/centos-7/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/centos-7/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/centos-7/conf/etc/php/php.webdevops.ini b/docker/php/centos-7/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/centos-7/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/centos-7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/centos-7/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/centos-7/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/centos-7/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/centos-7/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/centos-7/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/centos-7/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/centos-7/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/php/centos-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/centos-7/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/centos-7/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/centos-7/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile deleted file mode 100644 index 9a3194fd4..000000000 --- a/docker/php/debian-10/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:debian-10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:debian-10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) | php always references the latest version - php-cli \ - php-fpm \ - php-json \ - php-intl \ - php-curl \ - php-mysql \ - php-gd \ - php-imagick \ - php-imap \ - php-sqlite3 \ - php-pgsql \ - php-ldap \ - php-opcache \ - php-soap \ - php-zip \ - php-mbstring \ - php-bcmath \ - php-xmlrpc \ - php-xsl \ - php-bz2 \ - php-pear \ - php-apcu \ - php-redis \ - php-mongodb \ - php-memcache \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/debian-10/Dockerfile.jinja2 b/docker/php/debian-10/Dockerfile.jinja2 deleted file mode 100644 index 8cdc0da4e..000000000 --- a/docker/php/debian-10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "debian-10") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.debian10() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/debian-10/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-10/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/debian-10/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/debian-10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-10/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/debian-10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/debian-10/conf/bin/service.d/php-fpm.sh b/docker/php/debian-10/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/debian-10/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/debian-10/conf/bin/usr-bin/docker-php-setting b/docker/php/debian-10/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/debian-10/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/debian-10/conf/etc/logrotate.d/php5-fpm b/docker/php/debian-10/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/debian-10/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-10/conf/etc/php/conf.d/.gitkeep b/docker/php/debian-10/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-10/conf/etc/php/fpm/.gitkeep b/docker/php/debian-10/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-10/conf/etc/php/php.ini b/docker/php/debian-10/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/debian-10/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/debian-10/conf/etc/php/php.webdevops.ini b/docker/php/debian-10/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/debian-10/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/debian-10/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-10/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/debian-10/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/debian-10/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/debian-10/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/debian-10/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/debian-10/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/debian-10/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/php/debian-10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-10/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/debian-10/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/debian-10/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile deleted file mode 100644 index acab930e4..000000000 --- a/docker/php/debian-7/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:debian-7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:debian-7 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile.jinja2 b/docker/php/debian-7/Dockerfile.jinja2 deleted file mode 100644 index 056da8be4..000000000 --- a/docker/php/debian-7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "debian-7") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.debian7() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/debian-7/conf/bin/usr-bin/docker-php-setting b/docker/php/debian-7/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/debian-7/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/debian-7/conf/etc/logrotate.d/php5-fpm b/docker/php/debian-7/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/debian-7/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-7/conf/etc/php/conf.d/.gitkeep b/docker/php/debian-7/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-7/conf/etc/php/fpm/.gitkeep b/docker/php/debian-7/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-7/conf/etc/php/php.ini b/docker/php/debian-7/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/debian-7/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/debian-7/conf/etc/php/php.webdevops.ini b/docker/php/debian-7/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/debian-7/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/debian-7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-7/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/debian-7/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/debian-7/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/debian-7/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/debian-7/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/debian-7/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/debian-7/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/php/debian-7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-7/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/debian-7/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/debian-7/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile deleted file mode 100644 index 6976fe746..000000000 --- a/docker/php/debian-8-php7/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:debian-8-php7 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && apt-install apt-transport-https lsb-release \ - && echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list \ - && echo "deb http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \ - && echo "deb-src http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \ - && wget -O- https://packages.sury.org/php/apt.gpg | apt-key add - \ - && echo "Package: *" > /etc/apt/preferences.d/debian_testing.pref \ - && echo "Pin: origin ftp2.de.debian.org" >> /etc/apt/preferences.d/debian_testing.pref \ - && echo "Pin-Priority: -10" >> /etc/apt/preferences.d/debian_testing.pref \ - && echo "Package: libpcre3" > /etc/apt/preferences.d/libpcre.pref \ - && echo "Pin: release a=testing" >> /etc/apt/preferences.d/libpcre.pref \ - && echo "Pin-Priority: 995" >> /etc/apt/preferences.d/libpcre.pref \ - && apt-get update \ - && apt-get -t testing install -y -f libpcre3 \ - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-imagick \ - php7.0-imap \ - php7.0-sqlite3 \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php7.0-redis \ - php7.0-memcached \ - php7.0-zip \ - php7.0-soap \ - php7.0-bcmath \ - php7.0-mbstring \ - php-mongodb \ - php-apcu \ - php-amqp \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile.jinja2 b/docker/php/debian-8-php7/Dockerfile.jinja2 deleted file mode 100644 index bad6f58f6..000000000 --- a/docker/php/debian-8-php7/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "debian-8") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.debianSury('jessie') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/debian-8-php7/conf/bin/usr-bin/docker-php-setting b/docker/php/debian-8-php7/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/debian-8-php7/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/debian-8-php7/conf/etc/logrotate.d/php5-fpm b/docker/php/debian-8-php7/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/debian-8-php7/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-8-php7/conf/etc/php/conf.d/.gitkeep b/docker/php/debian-8-php7/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8-php7/conf/etc/php/fpm/.gitkeep b/docker/php/debian-8-php7/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8-php7/conf/etc/php/php.ini b/docker/php/debian-8-php7/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/debian-8-php7/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini b/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/debian-8-php7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-8-php7/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/debian-8-php7/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/debian-8-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/debian-8-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/debian-8-php7/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/debian-8-php7/conf/provision/entrypoint.d/.gitkeep b/docker/php/debian-8-php7/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile deleted file mode 100644 index 1f8b75d67..000000000 --- a/docker/php/debian-8/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:debian-8 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:debian-8 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile.jinja2 b/docker/php/debian-8/Dockerfile.jinja2 deleted file mode 100644 index e0f6fcbc4..000000000 --- a/docker/php/debian-8/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "debian-8") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.debian8() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/debian-8/conf/bin/usr-bin/docker-php-setting b/docker/php/debian-8/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/debian-8/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/debian-8/conf/etc/logrotate.d/php5-fpm b/docker/php/debian-8/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/debian-8/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-8/conf/etc/php/conf.d/.gitkeep b/docker/php/debian-8/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8/conf/etc/php/fpm/.gitkeep b/docker/php/debian-8/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8/conf/etc/php/php.ini b/docker/php/debian-8/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/debian-8/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/debian-8/conf/etc/php/php.webdevops.ini b/docker/php/debian-8/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/debian-8/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/debian-8/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-8/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/debian-8/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/debian-8/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/debian-8/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/debian-8/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/debian-8/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/debian-8/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/php/debian-8/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-8/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/debian-8/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/debian-8/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile deleted file mode 100644 index 31b2f8e0b..000000000 --- a/docker/php/debian-9/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:debian-9 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:debian-9 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-imagick \ - php7.0-imap \ - php7.0-sqlite3 \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-soap \ - php7.0-zip \ - php7.0-mbstring \ - php7.0-bcmath \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php-pear \ - php-apcu \ - php-redis \ - php-mongodb \ - php-memcache \ - php-memcached \ - php-amqp \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile.jinja2 b/docker/php/debian-9/Dockerfile.jinja2 deleted file mode 100644 index a83c39396..000000000 --- a/docker/php/debian-9/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "debian-9") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/debian-9/conf/bin/usr-bin/docker-php-setting b/docker/php/debian-9/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/debian-9/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/debian-9/conf/etc/logrotate.d/php5-fpm b/docker/php/debian-9/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/debian-9/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-9/conf/etc/php/conf.d/.gitkeep b/docker/php/debian-9/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-9/conf/etc/php/fpm/.gitkeep b/docker/php/debian-9/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-9/conf/etc/php/php.ini b/docker/php/debian-9/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/debian-9/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/debian-9/conf/etc/php/php.webdevops.ini b/docker/php/debian-9/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/debian-9/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/debian-9/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-9/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/debian-9/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/debian-9/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/debian-9/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/debian-9/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/debian-9/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/debian-9/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/php/debian-9/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/debian-9/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/debian-9/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/debian-9/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile deleted file mode 100644 index 8500ff916..000000000 --- a/docker/php/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-12.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - #php-memcached \ - php5-imagick \ - #php5-redis \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile.jinja2 b/docker/php/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index 876a24298..000000000 --- a/docker/php/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-12.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.ubuntu12() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 9adb0027b..000000000 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-12.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-12.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-12.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-12.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-12.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-12.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-12.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-12.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-12.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-12.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-12.04/conf/etc/php/php.ini b/docker/php/ubuntu-12.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-12.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-12.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-12.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-12.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile deleted file mode 100644 index 7952a1121..000000000 --- a/docker/php/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-14.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile.jinja2 b/docker/php/ubuntu-14.04/Dockerfile.jinja2 deleted file mode 100644 index e127c6f47..000000000 --- a/docker/php/ubuntu-14.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-14.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.ubuntu14() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-14.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-14.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-14.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-14.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-14.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-14.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-14.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-14.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-14.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-14.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-14.04/conf/etc/php/php.ini b/docker/php/ubuntu-14.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-14.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-14.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-14.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-14.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile deleted file mode 100644 index b7041841d..000000000 --- a/docker/php/ubuntu-15.04/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-15.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-15.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile.jinja2 b/docker/php/ubuntu-15.04/Dockerfile.jinja2 deleted file mode 100644 index bf2c75120..000000000 --- a/docker/php/ubuntu-15.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-15.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.ubuntu14() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-15.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-15.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-15.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-15.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-15.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-15.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-15.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-15.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-15.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.04/conf/etc/php/php.ini b/docker/php/ubuntu-15.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-15.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-15.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-15.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-15.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile deleted file mode 100644 index aa1fe7caa..000000000 --- a/docker/php/ubuntu-15.10/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-15.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-15.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile.jinja2 b/docker/php/ubuntu-15.10/Dockerfile.jinja2 deleted file mode 100644 index b1f0f8493..000000000 --- a/docker/php/ubuntu-15.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-15.10") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php5.ubuntu14() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-15.10/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-15.10/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-15.10/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-15.10/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-15.10/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-15.10/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-15.10/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-15.10/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.10/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-15.10/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.10/conf/etc/php/php.ini b/docker/php/ubuntu-15.10/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-15.10/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-15.10/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-15.10/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-15.10/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile deleted file mode 100644 index 042bb6f03..000000000 --- a/docker/php/ubuntu-16.04/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-16.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-16.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-sqlite3 \ - php7.0-imap \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-soap \ - php7.0-zip \ - php7.0-mbstring \ - php7.0-bcmath \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile.jinja2 b/docker/php/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 1ed5da803..000000000 --- a/docker/php/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-16.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-16.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-16.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-16.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-16.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-16.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-16.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.04/conf/etc/php/php.ini b/docker/php/ubuntu-16.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-16.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-16.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-16.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-16.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile deleted file mode 100644 index 4f3133dc2..000000000 --- a/docker/php/ubuntu-16.10/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-16.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-16.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-sqlite3 \ - php7.0-imap \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-soap \ - php7.0-zip \ - php7.0-mbstring \ - php7.0-bcmath \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile.jinja2 b/docker/php/ubuntu-16.10/Dockerfile.jinja2 deleted file mode 100644 index 4a7c52af0..000000000 --- a/docker/php/ubuntu-16.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-16.10") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-16.10/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-16.10/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-16.10/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-16.10/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-16.10/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.10/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-16.10/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.10/conf/etc/php/php.ini b/docker/php/ubuntu-16.10/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-16.10/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-16.10/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-16.10/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-16.10/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile deleted file mode 100644 index dba18c285..000000000 --- a/docker/php/ubuntu-17.04/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-17.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-17.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-sqlite3 \ - php7.0-imap \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-soap \ - php7.0-zip \ - php7.0-mbstring \ - php7.0-bcmath \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-17.04/Dockerfile.jinja2 b/docker/php/ubuntu-17.04/Dockerfile.jinja2 deleted file mode 100644 index ef4cbf27c..000000000 --- a/docker/php/ubuntu-17.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-17.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-17.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-17.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-17.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-17.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-17.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-17.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-17.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-17.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-17.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-17.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.04/conf/etc/php/php.ini b/docker/php/ubuntu-17.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-17.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-17.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-17.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-17.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-17.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-17.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-17.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile deleted file mode 100644 index bd7c1755b..000000000 --- a/docker/php/ubuntu-17.10/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-17.10 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-17.10 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.1-cli \ - php7.1-fpm \ - php7.1-json \ - php7.1-intl \ - php7.1-curl \ - php7.1-mysql \ - php7.1-gd \ - php7.1-sqlite3 \ - php7.1-imap \ - php7.1-pgsql \ - php7.1-ldap \ - php7.1-opcache \ - php7.1-soap \ - php7.1-zip \ - php7.1-mbstring \ - php7.1-bcmath \ - php7.1-xmlrpc \ - php7.1-xsl \ - php7.1-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-libsodium \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-17.10/Dockerfile.jinja2 b/docker/php/ubuntu-17.10/Dockerfile.jinja2 deleted file mode 100644 index 3ce1c7de1..000000000 --- a/docker/php/ubuntu-17.10/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-17.10") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu(phpVersion='7.1') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-17.10/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-17.10/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-17.10/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-17.10/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-17.10/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-17.10/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-17.10/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-17.10/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-17.10/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.10/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-17.10/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.10/conf/etc/php/php.ini b/docker/php/ubuntu-17.10/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-17.10/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-17.10/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-17.10/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-17.10/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-17.10/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-17.10/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-17.10/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-17.10/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile deleted file mode 100644 index 093cad5f5..000000000 --- a/docker/php/ubuntu-18.04/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-18.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-18.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.2-cli \ - php7.2-fpm \ - php7.2-json \ - php7.2-intl \ - php7.2-curl \ - php7.2-mysql \ - php7.2-gd \ - php7.2-sqlite3 \ - php7.2-imap \ - php7.2-pgsql \ - php7.2-ldap \ - php7.2-opcache \ - php7.2-soap \ - php7.2-zip \ - php7.2-mbstring \ - php7.2-bcmath \ - php7.2-xmlrpc \ - php7.2-xsl \ - php7.2-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-18.04/Dockerfile.jinja2 b/docker/php/ubuntu-18.04/Dockerfile.jinja2 deleted file mode 100644 index 1ee41faed..000000000 --- a/docker/php/ubuntu-18.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-18.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu(phpVersion='7.2') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-18.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-18.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-18.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-18.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-18.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-18.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-18.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-18.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-18.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-18.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-18.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-18.04/conf/etc/php/php.ini b/docker/php/ubuntu-18.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-18.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-18.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-18.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-18.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-18.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-18.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-18.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-18.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php/ubuntu-20.04/Dockerfile b/docker/php/ubuntu-20.04/Dockerfile deleted file mode 100644 index 399a43da1..000000000 --- a/docker/php/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:ubuntu-20.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:ubuntu-20.04 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV COMPOSER_VERSION="2" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.2-cli \ - php7.2-fpm \ - php7.2-json \ - php7.2-intl \ - php7.2-curl \ - php7.2-mysql \ - php7.2-gd \ - php7.2-sqlite3 \ - php7.2-imap \ - php7.2-pgsql \ - php7.2-ldap \ - php7.2-opcache \ - php7.2-soap \ - php7.2-zip \ - php7.2-mbstring \ - php7.2-bcmath \ - php7.2-xmlrpc \ - php7.2-xsl \ - php7.2-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 9000 diff --git a/docker/php/ubuntu-20.04/Dockerfile.jinja2 b/docker/php/ubuntu-20.04/Dockerfile.jinja2 deleted file mode 100644 index a02c7c509..000000000 --- a/docker/php/ubuntu-20.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("base-app", "ubuntu-20.04") }} - -{{ environment.web() }} -{{ environment.phpComposerVersion() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php7.ubuntu(phpVersion='7.2') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('9000') }} diff --git a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php/ubuntu-20.04/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php/ubuntu-20.04/conf/bin/usr-bin/docker-php-setting b/docker/php/ubuntu-20.04/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php/ubuntu-20.04/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php/ubuntu-20.04/conf/etc/logrotate.d/php5-fpm b/docker/php/ubuntu-20.04/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php/ubuntu-20.04/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-20.04/conf/etc/php/conf.d/.gitkeep b/docker/php/ubuntu-20.04/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-20.04/conf/etc/php/fpm/.gitkeep b/docker/php/ubuntu-20.04/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-20.04/conf/etc/php/php.ini b/docker/php/ubuntu-20.04/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php/ubuntu-20.04/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php/ubuntu-20.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-20.04/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php/ubuntu-20.04/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php/ubuntu-20.04/conf/etc/supervisor.d/php-fpm.conf b/docker/php/ubuntu-20.04/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php/ubuntu-20.04/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/10-php-init.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index a6eaeb88b..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - ############################# - # PHP 5.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - PHP_ETC_DIR=/etc/php5 - if [[ -d "/etc/php5/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php5/mods-available - else - PHP_MOD_INI_DIR=/etc/php5/conf.d - fi - PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php5-fpm - ;; - - RedHat) - PHP_ETC_DIR=/etc/php.d - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php5 - PHP_MOD_INI_DIR=/etc/php5/conf.d - PHP_MAIN_CONF=/etc/php5/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php5/fpm.d - PHP_FPM_BIN=/usr/bin/php-fpm5 - ;; - esac - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.4.0")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - if [[ "$(version-compare "$PHP_VERSION" "5.4.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.4.27")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - - # Check for claer env setting (not available in old versions) - if [[ "$(version-compare "$PHP_VERSION" "5.5.*")" == "=" ]] && [[ "$(version-compare "$PHP_VERSION" "5.5.11")" == "<" ]]; then - PHP_CLEAR_ENV_AVAILABLE=0 - fi - -elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then - ############################# - # PHP 7.x - ############################# - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - if [[ "$(version-compare "$PHP_VERSION" "7.4.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.4 - if [[ -d "/etc/php/7.4/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.4/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.4/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.4/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.4/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.4 - elif [[ "$(version-compare "$PHP_VERSION" "7.3.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.3 - if [[ -d "/etc/php/7.3/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.3/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.3/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.3/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.3/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.3 - elif [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.2 - if [[ -d "/etc/php/7.2/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.2/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.2/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.2 - elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then - PHP_ETC_DIR=/etc/php/7.1 - if [[ -d "/etc/php/7.1/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.1/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.1/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.1 - else - PHP_ETC_DIR=/etc/php/7.0 - if [[ -d "/etc/php/7.0/mods-available" ]]; then - PHP_MOD_INI_DIR=/etc/php/7.0/mods-available - else - PHP_MOD_INI_DIR=/etc/php/7.0/conf.d - fi - PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf - PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d - PHP_FPM_BIN=/usr/sbin/php-fpm7.0 - fi - PHP_POOL_CONF=www.conf - ;; - - RedHat) - PHP_ETC_DIR="/etc/php.d" - PHP_MOD_INI_DIR=/etc/php.d - PHP_MAIN_CONF=/etc/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm - ;; - - Alpine) - PHP_ETC_DIR=/etc/php7 - PHP_MOD_INI_DIR=/etc/php7/conf.d - PHP_MAIN_CONF=/etc/php7/php-fpm.conf - PHP_POOL_CONF=www.conf - PHP_POOL_DIR=/etc/php7/php-fpm.d - PHP_FPM_BIN=/usr/sbin/php-fpm7 - ;; - esac -fi diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index a1975d5cd..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable mcrypt (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/mcrypt.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/cli/conf.d/20-mcrypt.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/mcrypt.ini" "${PHP_ETC_DIR}/fpm/conf.d/20-mcrypt.ini" - fi - - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/cli/conf.d/98-webdevops.ini" - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/fpm/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/cli/conf.d/99-docker.ini" - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/fpm/conf.d/99-docker.ini" - ;; - - RedHat) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "/etc/php.d/zza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "/etc/php.d/zzz-docker.ini" - ;; - - Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/xzza-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/xzzz-docker.ini" - ;; -esac diff --git a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -echo "Installing ionCube loader" - -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep b/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php/ubuntu-20.04/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/piwik/README.md b/docker/piwik/README.md deleted file mode 100644 index 82e16add2..000000000 --- a/docker/piwik/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# Piwik container - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -Based on `webdevops/php-nginx:ubuntu-14.04` with automatic Piwik installer - -Install location is `/app/piwik`, crontask is automatically configured. - -## Environment variables - -Variable | Description ----------------------- | ------------------------------------------------------------------------------ -`PIWIK_URL` | URL of piwik installation (requried for crontask) - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/piwik:latest | [![](https://badge.imagelayers.io/webdevops/piwik:latest.svg)](https://imagelayers.io/?images=webdevops/piwik:latest 'Get your own badge on imagelayers.io') diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile deleted file mode 100644 index a8238fb01..000000000 --- a/docker/piwik/latest/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/piwik:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.4 - -ENV WEB_DOCUMENT_ROOT /app/piwik/ -ENV PIWIK_URL http://example.com/ - -COPY conf/ /opt/docker/ - -RUN set -x \ - && mkdir -p /app/ \ - && wget -O/tmp/piwik.zip http://builds.piwik.org/piwik.zip \ - && unzip /tmp/piwik.zip -d /app/ \ - && rm -f /tmp/piwik.zip \ - && chown -R application /app \ - && find /app/ -type d -exec chmod 0755 {} \; \ - && find /app/ -type f -exec chmod 0644 {} \; \ - && docker-run-bootstrap \ - && docker-image-cleanup - -VOLUME /app diff --git a/docker/piwik/latest/Dockerfile.jinja2 b/docker/piwik/latest/Dockerfile.jinja2 deleted file mode 100644 index 05ed73cf1..000000000 --- a/docker/piwik/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php-nginx", "7.4") }} - -ENV WEB_DOCUMENT_ROOT /app/piwik/ -ENV PIWIK_URL http://example.com/ - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ piwik.install() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -VOLUME /app diff --git a/docker/piwik/latest/conf/bin/piwik-cron.sh b/docker/piwik/latest/conf/bin/piwik-cron.sh deleted file mode 100644 index df0e88b28..000000000 --- a/docker/piwik/latest/conf/bin/piwik-cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. /opt/docker/bin/piwik-env.sh - -/usr/bin/php /app/code/piwik/console core:archive --url="$PIWIK_URL" diff --git a/docker/piwik/latest/conf/bin/piwik-env.sh b/docker/piwik/latest/conf/bin/piwik-env.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/piwik/latest/conf/bin/piwik-env.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/piwik/latest/conf/etc/cron/crontab b/docker/piwik/latest/conf/etc/cron/crontab deleted file mode 100644 index aa65b6d98..000000000 --- a/docker/piwik/latest/conf/etc/cron/crontab +++ /dev/null @@ -1 +0,0 @@ -5 * * * * application bash /opt/docker/bin/piwik-cron.sh &> /dev/null diff --git a/docker/piwik/latest/conf/etc/php/php.ini b/docker/piwik/latest/conf/etc/php/php.ini deleted file mode 100644 index 1267427ea..000000000 --- a/docker/piwik/latest/conf/etc/php/php.ini +++ /dev/null @@ -1,40 +0,0 @@ -; ------------------------------------- -; PRODUCTION configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 - -short_open_tag = On -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 900 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -date.timezone = Europe/Berlin - -mysql.default_host = mysql -mysqli.default_host = mysql - -; Zend OPCache -opcache.enable = 1 -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 10000 -opcache.fast_shutdown = 1 -opcache.enable_cli = 1 -opcache.revalidate_freq = 2 -opcache.validate_timestamps = 1 - -; XDebug -xdebug.remote_enable = 0 -xdebug.remote_connect_back = off diff --git a/docker/piwik/latest/conf/provision/entrypoint.d/10-piwik-env.sh b/docker/piwik/latest/conf/provision/entrypoint.d/10-piwik-env.sh deleted file mode 100644 index b1a540d55..000000000 --- a/docker/piwik/latest/conf/provision/entrypoint.d/10-piwik-env.sh +++ /dev/null @@ -1 +0,0 @@ -export|grep PIWIK > /opt/docker/bin/piwik-env.sh diff --git a/docker/postfix/README.md b/docker/postfix/README.md deleted file mode 100644 index c35c83ecf..000000000 --- a/docker/postfix/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Postfix container layout - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -## Environment variables - -Variable | Description --------------------- | ------------------------------------------------------------------------------ -`POSTFIX_MYNETWORKS` | Postfix mynetwork setting -`POSTFIX_RELAYHOST` | Postfix relayhost setting - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/postfix:latest | [![](https://badge.imagelayers.io/webdevops/postfix:latest.svg)](https://imagelayers.io/?images=webdevops/postfix:latest 'Get your own badge on imagelayers.io') diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile deleted file mode 100644 index 352a16bac..000000000 --- a/docker/postfix/latest/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/postfix:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base-app:latest - -COPY conf/ /opt/docker/ - -RUN set -x \ - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 25 465 587 diff --git a/docker/postfix/latest/Dockerfile.jinja2 b/docker/postfix/latest/Dockerfile.jinja2 deleted file mode 100644 index c9e07770d..000000000 --- a/docker/postfix/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base-app") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ postfix.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('25 465 587') }} diff --git a/docker/postfix/latest/conf/provision/bootstrap.d/.gitkeep b/docker/postfix/latest/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/README.md b/docker/samson-deployment/README.md deleted file mode 100644 index 56de73ecf..000000000 --- a/docker/samson-deployment/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Samson deployment container layout - -[Zendesk](https://www.zendesk.com/) Deployment web ui with Ansible Ansistrano, Capistrano and PHP Deployer support - -[Samson Boilerplate is available at GitHub.](https://github.com/webdevops/samson-deployment) - -Installed packages: -* [Samson deployment web ui](https://github.com/zendesk/samson) -* [Ansible](https://www.ansible.com/) with [Ansistrano](https://github.com/ansistrano) -* [Capistrano](http://capistranorb.com/) -* [PHP Deployer](http://deployer.org/) -* [Magallanes](http://magephp.com/) -* git -* rsync -* docker & docker-compose (as client) -* gulp, grunt, bower -* PHP cli & [composer](https://getcomposer.org/) diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile deleted file mode 100644 index 48aeecc5e..000000000 --- a/docker/samson-deployment/latest/Dockerfile +++ /dev/null @@ -1,195 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/samson-deployment:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM zendesk/samson:latest - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 - -############################################################################### -# Bootstrap -############################################################################### - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg \ - && docker-image-cleanup - -############################################################################### -# Base -############################################################################### - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install ansible - && apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - openssh-client \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --no-cache-dir ansible \ - && chmod 750 /usr/local/bin/ansible* \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ - && docker-image-cleanup - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -############################################################################### -# Base-app -############################################################################### - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -############################################################################### -# Samson -############################################################################### - -RUN set -x \ - ENV RAILS_ENV="production" - -ENV SQLITE_CLEANUP_DAYS=0 - -# NGINX reverse proxy -RUN export DEBIAN_FRONTEND=noninteractive && set -x \ - && echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list \ - && curl -fsSL https://yum.dockerproject.org/gpg | apt-key add - \ - && apt-install \ - # Install nginx - nginx \ - # Install docker - docker-engine \ - # Install php - php-cli \ - php-mysqlnd \ - php-mcrypt \ - php-curl \ - php-recode \ - php-json \ - # Install java - openjdk-8-jre \ - # SQlite 3 - sqlite3 \ - && pip install -U \ - docker-compose \ - python-dotenv \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ - ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* \ - && docker-image-cleanup - -# NPM stack -RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ - && apt-get install -y nodejs \ - && npm install -g gulp \ - && npm install -g grunt-cli \ - && npm install -g bower \ - && npm install -g npm-cache \ - && docker-image-cleanup - -# Deployer stack -RUN set -x \ - # Compiler stuff - && apt-install \ - build-essential \ - # Deployer: Ansistratno (https://github.com/ansistrano) - && ansible-galaxy install --force \ - ansistrano.deploy \ - ansistrano.rollback \ - # Deployer: PHP Deployer (http://deployer.org/) - && wget --quiet -O/usr/local/bin/dep http://deployer.org/deployer.phar \ - && chmod +x /usr/local/bin/dep \ - # Deployer: capistrano (http://capistranorb.com/) - && gem install capistrano \ - && docker-image-cleanup - -# Upload -ADD database.yml /app/config/database.yml -ADD web/ /app/public/assets/ - -ADD crontab /etc/cron.d/webdevops-samson-deployment - -RUN rake assets:precompile \ - && docker-service enable cron \ - && /opt/docker/bin/provision run --tag bootstrap --role webdevops-samson-deployment \ - && /opt/docker/bin/bootstrap.sh \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 -VOLUME /storage - -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 deleted file mode 100644 index 3710b20ac..000000000 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,55 +0,0 @@ - -{{ docker.from("samson", user="zendesk") }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} - -############################################################################### -# Bootstrap -############################################################################### - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.debian('jessie') }} \ - {{ docker.cleanup() }} - -############################################################################### -# Base -############################################################################### - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ ansible.debian() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -############################################################################### -# Base-app -############################################################################### - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -############################################################################### -# Samson -############################################################################### - -RUN set -x \ - {{ samsonDeployment.general() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80') }} -{{ docker.volume('/storage') }} - -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/samson-deployment/latest/conf/VERSION b/docker/samson-deployment/latest/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/samson-deployment/latest/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/samson-deployment/latest/conf/bin/bootstrap.sh b/docker/samson-deployment/latest/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/samson-deployment/latest/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/samson-deployment/latest/conf/bin/config.sh b/docker/samson-deployment/latest/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/samson-deployment/latest/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/samson-deployment/latest/conf/bin/control.sh b/docker/samson-deployment/latest/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/samson-deployment/latest/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/default.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/root.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/samson-deployment/latest/conf/bin/provision b/docker/samson-deployment/latest/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/samson-deployment/latest/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/samson-deployment/latest/conf/bin/provision.py b/docker/samson-deployment/latest/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/samson-deployment/latest/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/samson-deployment/latest/conf/bin/samson-cleanup-db.sh b/docker/samson-deployment/latest/conf/bin/samson-cleanup-db.sh deleted file mode 100644 index 09dc0cb5e..000000000 --- a/docker/samson-deployment/latest/conf/bin/samson-cleanup-db.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ -d "/storage/db/" ]]; then - find /storage/db/ -iname "*.sqlite3" | while read SQLITE_DATABSE; do - if [[ "$SQLITE_CLEANUP_DAYS" -gt 0 ]]; then - echo "Cleanup old deployment job logs (older than ${SQLITE_CLEANUP_DAYS} days)" - sqlite3 "$SQLITE_DATABSE" "UPDATE jobs SET output = '# Log cleared' WHERE created_at <= date('now', '-${SQLITE_CLEANUP_DAYS} day');" || echo " -> ERROR: Cleanup failed" - fi - - echo "Running VACUUM on $SQLITE_DATABSE" - sqlite3 "$SQLITE_DATABSE" "VACUUM;" || echo " -> ERROR: VACUUM failed" - done -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/cron.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/cron.sh b/docker/samson-deployment/latest/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.sh b/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 47e13a4d4..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/samson-deployment/latest/conf/bin/service.d/nginx.sh b/docker/samson-deployment/latest/conf/bin/service.d/nginx.sh deleted file mode 100644 index f5cd26167..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx diff --git a/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/samson-deployment/latest/conf/bin/service.d/postfix.sh b/docker/samson-deployment/latest/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/samson.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/samson.d/10-init.sh deleted file mode 100644 index 24a053a6d..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/samson.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -############################# -# Vacuum database -############################# - -if [[ -x "/opt/docker/bin/samson-cleanup-db.sh" ]]; then - /opt/docker/bin/samson-cleanup-db.sh -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/samson.sh b/docker/samson-deployment/latest/conf/bin/service.d/samson.sh deleted file mode 100644 index ef42ef789..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/samson.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/samson.d/" - -sleep 1 - -echo "(Re-)Starting Samson" -cd /app/ -bin/rake db:migrate -exec bundle exec puma -C ./config/puma.rb -e "$RAILS_ENV" - - diff --git a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/samson-deployment/latest/conf/bin/service.d/ssh.sh b/docker/samson-deployment/latest/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/service.d/supervisor.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/samson-deployment/latest/conf/bin/service.d/supervisor.sh b/docker/samson-deployment/latest/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.sh b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/container-file-auto-restore b/docker/samson-deployment/latest/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-ansible-install b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-cronjob b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/service b/docker/samson-deployment/latest/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/version-compare b/docker/samson-deployment/latest/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/samson-deployment/latest/conf/etc/cron/.gitkeep b/docker/samson-deployment/latest/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/etc/logrotate.d/syslog-ng b/docker/samson-deployment/latest/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/samson-deployment/latest/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/samson-deployment/latest/conf/etc/nginx/vhost.conf b/docker/samson-deployment/latest/conf/etc/nginx/vhost.conf deleted file mode 100644 index 3d6624e55..000000000 --- a/docker/samson-deployment/latest/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,38 +0,0 @@ -upstream app { - server 127.0.0.1:9080; - keepalive 16; -} - -server { - listen 80; - server_name localhost; - - root /app/public/assets/; - - try_files $uri/index.html $uri @app; - - location @app { - proxy_pass http://app; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_buffering off; - proxy_redirect off; - proxy_read_timeout 300s; - - # Enable live streaming - proxy_http_version 1.1; - proxy_set_header Connection ""; - } - - location /500.html { - } - - location /502.html { - } - - error_page 500 503 504 /500.html; - error_page 502 /502.html; - - client_max_body_size 4G; - keepalive_timeout 10; -} diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.conf b/docker/samson-deployment/latest/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/.gitkeep b/docker/samson-deployment/latest/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/cron.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/docker.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/docker.conf deleted file mode 100644 index 519d04e46..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/docker.conf +++ /dev/null @@ -1,12 +0,0 @@ -[group:docker] -programs=dockerd -priority=25 - -[program:dockerd] -command = /usr/bin/docker daemon -autostart = false -autorestart = false -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/nginx.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/postfix.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/samson.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/samson.conf deleted file mode 100644 index 609c2ae1c..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/samson.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:samson] -programs=samsond -priority=25 - -[program:samsond] -command = /opt/docker/bin/service.d/samson.sh -user = application -environment = HOME="/home/application",USER="application,LC_CTYPE="en_US.UTF-8" -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/ssh.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf b/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/samson-deployment/latest/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/samson-deployment/latest/conf/provision/ansible.cfg b/docker/samson-deployment/latest/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-permissions.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-supervisor.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-user-application.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/20-app.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/samson-deployment/latest/conf/provision/bootstrap.d/90-cleanup.sh b/docker/samson-deployment/latest/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/samson-deployment/latest/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/samson-deployment/latest/conf/provision/build.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/build.d/10-cleanup.sh b/docker/samson-deployment/latest/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/samson-deployment/latest/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/samson-deployment/latest/conf/provision/entrypoint.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh b/docker/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/samson-deployment/latest/conf/provision/onbuild.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/roles/.gitkeep b/docker/samson-deployment/latest/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/defaults/main.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/defaults/main.yml deleted file mode 100644 index 52f577b63..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" -APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml deleted file mode 100644 index 259464e7f..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- name: Add application to docker group - user: - name: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - groups: "docker" - append: yes - -- name: Fix permissions - file: - path: "/app" - owner: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - recurse: yes - -- name: Diable nginx demonize mode - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'daemon', value: 'off' } - -- name: Enable nginx main config - file: - src: '/opt/docker/etc/nginx/vhost.conf' - dest: '/etc/nginx/sites-available/default' - state: link - force: yes - -- name: Fix permissions of public and asset directories - command: find /app/public -type d -exec chmod -c 0755 {} \; - -- name: Fix permissions of public and asset files - command: find /app/public -type f -exec chmod -c 0644 {} \; - -- name: Fix owner of public and asset files - command: chown -R '{{ APPLICATION_USER }}:{{ APPLICATION_GROUP }}' /app/public - -- name: Remove old log directory - file: - path: "/var/lib/nginx/logs" - state: absent - -- name: Create log directory - file: - path: "/var/lib/nginx/logs" - state: directory - -- name: Create stdout symlinks - file: - dest: "{{ item }}" - src: "/docker.stdout" - state: link - force: yes - with_items: - - "/var/lib/nginx/logs/access.log" - - "/var/lib/nginx/logs/error.log" - -- name: Create storage directories - file: - path: "{{ item }}" - state: directory - owner: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - mode: u=rwX,g=rX,o=rX - recurse: yes - with_items: - - "/storage" - - "/storage/db" diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml deleted file mode 100644 index cd21505a4..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- - diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/main.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/main.yml deleted file mode 100644 index 7895a52a9..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap - -- include: entrypoint.yml - tags: - - entrypoint diff --git a/docker/samson-deployment/latest/conf/provision/service.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/samson-deployment/latest/conf/provision/service.d/cron.sh b/docker/samson-deployment/latest/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/samson-deployment/latest/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh b/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh b/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml b/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/samson-deployment/latest/conf/provision/variables.yml b/docker/samson-deployment/latest/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/samson-deployment/latest/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/samson-deployment/latest/crontab b/docker/samson-deployment/latest/crontab deleted file mode 100644 index f22da7310..000000000 --- a/docker/samson-deployment/latest/crontab +++ /dev/null @@ -1,8 +0,0 @@ -# m h dom mon dow user command - -# Self update packages -15 5 * * * root composer self-update &> /dev/null -20 5 * * * root dep self-update &> /dev/null - -# Maintenance and cleanup -30 5 * * * root /opt/docker/bin/samson-cleanup-db.sh &> /dev/null diff --git a/docker/samson-deployment/latest/database.yml b/docker/samson-deployment/latest/database.yml deleted file mode 100644 index a7c02a618..000000000 --- a/docker/samson-deployment/latest/database.yml +++ /dev/null @@ -1,23 +0,0 @@ -production: - adapter: sqlite3 - database: /storage/db/database.sqlite3 - pool: 5 - timeout: 5000 - -staging: - adapter: sqlite3 - database: /storage/db/database.sqlite3 - pool: 5 - timeout: 5000 - -development: - adapter: sqlite3 - database: /storage/db/database.sqlite3 - pool: 5 - timeout: 5000 - -test: - adapter: sqlite3 - database: /storage/db/database.sqlite3 - pool: 5 - timeout: 5000 diff --git a/docker/samson-deployment/latest/web/502.html b/docker/samson-deployment/latest/web/502.html deleted file mode 100644 index 8a89cfa91..000000000 --- a/docker/samson-deployment/latest/web/502.html +++ /dev/null @@ -1,101 +0,0 @@ - - - Samson deployment - - - - - - - -
- -
- - diff --git a/docker/samson-deployment/latest/web/logo_light.png b/docker/samson-deployment/latest/web/logo_light.png deleted file mode 100644 index b8f0e30638aa9c7c9af9846fe1da56b464dfd93c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16903 zcmZ|1by!qi)F@0!2nf<0Qj#Ji-69Q2cPQOmLkUQyG($-aH3&oJNVjyiba(R|e((3* z``3MV4s6b@wbov}_Dr~{vMe?x872Y(0=C>I>CXrVh*Q9`jQ#?6b3k~L0Q`Ajsvs+k z@bvtX(^8ZOyuon%q~n5s@Dl&|K}1N;BmrKcxymWYpsk>g61>2y%$5IxfIx#FCoQ4w zId=e73HvJNx7=nh&yDmdi-qzl7N0tw(^#)6FG(}M)}`sPrfd0C&Noi5U0``+ZK<86 zrAf-LIq_F|Rf||0L(=`>Myx4`blV#KmmbNW6U;y6f%zh+iKs**cPsLohBM&Fnpd38 zLPd>_U%Mm2h)TIpIJTHiN01TVn4@nGWgoo|#I+Gu1f#fwv=I?ZPy-zI&5#g+2?5%e zpaQ@CPYW1@fPkwBy!yYb|2qGB_kV`{KPQlF@G&A-;+QF_jO|iWzc_T+OaKrPNJh1c z(W^9Ufny@y%Uaos?1Ys%3ws{iEvwH*960RbQy&fgvJ zF^QM0!{PZ{YHZKz{>;Id+;6pF8>Yv`(|!hBLdF;oS2I8o1$KmTk@MZ?sS{(LK;;?b zUCiB>{P_GkZKFdebm3UL89X|I1Arl)j%Bm`#G%d5xIi`Z!wZzc?DOx`5rQ(kTP%ilH~E+?z4 zwcgbk{=pBFotnd=LJ5E(l|}4oTjBp4-oV@_Wl0djKBm0&HdtuO*0zl;han4N0PCT+ z^sd?Uz-TL8txeh1% zFe#0TC^P?MsfrS0fSNvejYoMs+Ok$LNmeFzNiUI2*+HE88}gs=0W89-?IcJ`SiXvJ zw&RFs5TjGb{6<{^7DmX^WtF5%u1DELaVMb-lF>&rLA7isJ}mBsW2dqE1nS9I zJp-iW)3bocaR3fxEnLZO2p+97zU>1Ty#%3Cf2de%(s0$LN&rGAzYM&4yc?!+n{hut z0;o(tWD>0|rW0;EH4?Gc0BQW=*5x(=dnL|l@|I+d83K~y#GACd#CCJtu@BP&A%tlo zu5o`yUQ@crp~}Z3*nF4%dJk~Y^rEM&_z|~7-dvDC}Gjr&VWjH z?{4x{W_Y!zCQFcA#!*X64j_q2s`JO_TR`l4PQJ~<$N|w6H;?~fbn!a57*l=Z z(QLAb@`p4djVWsHJKc+aHRcnjNe{~8)?x^BngN4(lUF)OIAb_~q>E2r0)#pUOZN2& zDh}X?$bF(e{Q9AhoDw)D+(rIW($R4*HAK<7e2oDf*ulSmM?6eGi%r=AIea z5@DI42miOq`r5uvLcIa7GJ=tQLgdi_i*%`%Y`G6T7a|-pj%xWI{7c?szS^GE+9fI= zR>Gv7qCF?+HBqnYI01=-zU3gFu^{!NwF*K_d>_9&>FiSheufg|ngd_?Lw7up#gW{a z`wL(uU%t^B?;!KMsh)817oHxcJ38JBNW*>Ha^;w8h)cG zHAjy}W#!?)b$WA-4@t9!>XWZ&LZ;^bwhB?@$=9UIPBiX-%A2}VDU*-%{yM~}Q?|{u z9$&qbdt-BeYcf>5>YdQ-T^%(SnBUW#imw4P!JGNL<0H!7@>lxM!0{_31W{%Y1P4EN@m;JCYE98XNm1Wd65T#f4@n z&O{!Z-A>Ms%;w=C<1Rt;qp=V}nFXL83vF;Lo~oq}u!k_LmkrvX6*(2BP(l& zesz{?sP4U94SB~qo@`HB9c*eoQZ7NaV=lsm@5Qyxa*WPydJ;C#ZMm)qLdCTQ2&Y5_ zlVLfRNEo{bnq{gqWrXvkND3Z(wfJ|+zJ=PHFAKxxDc3M}wa0n_QQYKM=hBhzQqaq| z%nyIh(s24(R8vg%en0Cxz;Qyo@C!Ej8!=hHhi(&P`BiJo1*MkKu`|LwU@oX}UGvO5 z9))+)GY0C7dlohS+1P?Z4zoW>JJ9`ycaWeK%%GO?WE!kvqvvGa;A!Gky^`45X09@( zU^Yk)Xh)F!kb*y$Ovn^IN4Xoht41f01R;;pb=i^ByVQR5&p-E+k)jNpt=ba7@>dQ= zq>!)@P4Q>9)`sQ6@*qw0Qr7R2DXy8@TA#Zx5aw8lMY||{e@!qYT+Y`%Ev1(k+Z;5& z+-Y_y#@L_KfD!V<6M~ZoyXe*U&CUVFA#js`O#6U&ijp6Mv^ot7DHnHGebWjB7 zp|;z0H{@rKU;@uByoxlKH)i~Dk?ojfwGuG2G<8)N5;EFOrU=GtroUsM$tx3VO$g%n zW-2PSDzs(n9;bny2oM5zf&>XLlF)5>P?9Iy5zs|y9Z_&i4t&v8-qkMW=NCaRiHM2B zKNTiyGF-ljn4&2Y|8ZP3o}2F^NiN}`Q>;6d`OdG#B`5~!u3)SKZxECR#iWRvQf;tN z*}kPMgZf$Qgy(;cyu2nE2?(uE)N7-`cx@8m9W-{sydFi9@~5*PR&&(y)vPfw>o%nIQy4K`&QQUKI=-)vJu&@(t-==oT0JbiAB(G;`E-N2R`P{UceWwHvHfa$;d|h%f z`o2GbB$!9rc{Pnqj{qwoI4%&Stoz|};lt%{KkM7IoM zMx`rGMnSh}K+0&07=NkZ!@CvViqC*eOZZowjLhs(gPpUeKU!QBPZND1+($kG%gMC- zK=x4?SwrR;tX>6I>Va@5lkoarCfd*P`LoW{k9BSe~_Q#N>%#s#m(1_8esNZ z1Ei)lbArY=*WRp=fA<$peg&0&iJA15VLNH2?GJoTJklquDW!wv*%~(2vhy(|-&56;iI(Tl2w59$8~+i<^9m+xt;> z`Wh|c!^g+0br(xuz1v%~>}^>w9C{M_<%_0ePlcmJ6U5?QpzuM%Ypf`g(YKE~TVh48 z+RkeI8i+Y?O_vFQ@L-$gXmJ+U+)M9igSzSn^V#jjT>@<-KOU1i?Af#tx$}R$7a4AP zc8e)DSGDZ-n%W+cA1{|NuhKF-o*e=~?7IqtXNSeS;pq0p2&3)jc3w3A5H=7 z(EmZic*Xk;BkMkB4FZ>$KL#4klpPXCybSS~U-vLN`o;{iq+HJ5WDi0fP^SGywOT*6+y1VJGA1-hFgL|FDU!0%0f|kfl+YSAG|@ zqWA9CplSbmPCrRJ|A0_H7EvuzN1nd3gO03#4xdnYcbCZmn`eib+|nR$IGDr!weE@C$eJ{<1Gtz-0DWuEJn^dSq_*|a zW`guZFV}xF{{8>Fr8x?kK6?6BbPE9R`v_B2N*zx#An2wj`zcfOet2Hu%HZkNzimvb zt*@0;oDv{c5Wohs!pLWx_B`U=Ge}n`O6qk^kWkoIk+mv%k+2dk;Vf zxaI#b$*6u!1Qe;}8JF}9-AJHG3N*)LN~d%IH=P5z;PK$o)(K3-1UAAsUIGIY-I>3= zuMA%H09{i1hX&@JvHf~JAF1X$WsOe%<1T1Qk^ix**m&DL<)uNctt34=Eg(7n^x7Vi z{jT``95y}9X8S{)RfrbNGvb2%DQ&oZ%NIY+td}puK-nOzZN6vO2nYC|{0ZO^=E%5# zcHm9VGlx(Srv&0@BE$hOJtqrLm^J~?c%ogyTny7>*x@Tg3}6@lO)p=ARn8yUu-=4< z-Bz97Q71QTc~3shYkX&^0n~vuA`MB^rGWy4Vz|QhjiH@#k<>t82SqayQVhL zc%Is+m@3>)fY|wX)Sm14AIlNn^$LpBzS-#|;f|}>dpuMelOF5U73zs>#J~gW{3Ho? z()s7H7DBb8d}O(iXs$12gE&)2CBT736 z=S58f_#C#xK{@(v2ez0Wja9^?ao_WvMvse}C@sP*$ChqJW3t4Ig(*%(V+$nQ(#GL{ zMh0>z=O<)Ajs00%=3%HNeN9ITV^>*^L65VGBPLPSB_0N~2I`URfHA1gIV?lp1&zd# z8q3x99)ZdQkLFBpE@lgiP-^$90KWl-;#O>ZwBLp_D1>cLmar zCCZc1Y5Cy0H@!U8_K=vp)AqPBt}QxtMR8pig0ZhU7PoGHurgJuMbP(AmGhfP`C|C- zlF(rb8sZz90RDTev6=A6h9B967b*ZD-?UzZ`)s{cO8rU^{krNmfqvE-wvjy1SZ2tW zd0K3SbTPNa);+F9SYPc~b=p}|+=D6JNy{tx7T2x5J07z%nzDZwyMh*KQiGSVbkdOZ z-bBQJ$bI>A+w>40C241>Mh6-wI%_`h1VG1xPpT<-b5}Z|O@VLZd}^3^=qt!0b77Y( zfs_i~$=i!5NJ6v<)FvVCf&?|)h%OBCjC|NiEXu($*ZYX&nAmFv{#xk!@%c>&%J?l$ zA}t(=VeRHPeF`@iyYCyeOyEX$l4ELvd8_~HaIwa58ZpjE6)bLk&`jFkDf;%k_TOA0 zdoYYbLd4nsGs7kQfVi}FE;~FutzA^jEpb?YJqil9AiwH$>z%>?`0?o>S(60Yo8w!1y()$J~zp0pC!E~zL%sb|BKcJ0f7B$R{0 z1&_$FXDrUNLGJaj?UgWodmalVnzTw6j1&}CMT{Vt0cp(hzjeXI)ea_Od(jhEJ?I`&o2hHnwzatNXcf8wr zi*cNYkTOb(>B_V`_VI$!H8QX?7MGkfWG!AbQXUA8UXWg@050UdG^J@Uj7`FBjg4ii zr@|rSBt0<`EzIU5uW|T57Vx?eiJCqe|45)>^o{ODAu^Fs<-}Ky5L#H^`;j0zw-PTT z{UB58qB7P)E__;`Z;fEV0u^z~8TB8AH%>bJp!k$tqHC_`_V+r4tkJSrIyBy&%5rP1 zYRa&A%C^Ef`!)t*S4glg?`k}mM**bpubGQ{RNhiD5*}IKn3J4!gjm&eT1u{XCuA}#rwMo1d04~ zoyIW4#G!BD=~iqa>2R0S2InXn{){R=Bx=`bWh^O%LFqZxmT~1<&S<4%;y#A{wNdw(~)~ey}x@=|MD{WAt@Bc#*a%V+QLf`LYU5 z(=Le&u#LWCeAxSWpPY*bDg9uVfeSnTS)*4!TSuRA`l|bKxufcI*C;?5At;~2cEj_V zGG(IWN6rLZ%)U=!y2P&+2wK!i;{5&Tm~1{l)cVV%qh4~*7wNYa9CVVZ>*H4x^p+{_ z(XOoI#R6d{mkToGEx|}a_K_ly#F}+c1TKB1Z;LZ!hJ;K-0B~K>dsS$R0vFxZ1>ot3 zRlkvmA@<|qssone0P^WxA3@ZCExN{6gmsFhtaImlaPN{F=f9rS*90e)L)a1=UN-(+ zbypX+_G7dCS6~>kmqp=FZ1=%mjkT9$XMK|xqwV4Qs;eqSG-YYHpYLNd4Aw()_?TE) zDQz^buS6&IA{Q#>=juIH8@O9q(VI8Ojm%pg;jl<6luOA?Ted*Eu9^AJf)y(o34<&d z8TE{UtsDLL_zW&{XFiN0zsmx*78ie$QI#@8uWD{A{Sa9G*KfailNQPyQX;hw;p1MXJKF1_ zF>9THxqHgS5~SM-&H8!zPu~q%vbF@RA(*jRgz$w6$Zc=}Az=|O%B7Cn`ia>6zj964 zvfooUFvG&R5?~`Ckywj}?I`;v&kEOn*EsY;Hv4)--9?mmQ}?Lu;P>HxO#Vt}y=r^h zwF4bY+t+Dn8?58Fx|I+7)0qIF@cQ_^7pVr0isufwppDyIZ|oJO4%wwuk3plNA(GGP z$b{~^o|!Gx&ucKX-@n?{yLpElho|z9N05y*s?lpwwv_haJ~Fn##al?l_59B!0hLti z2{^XW6zu2x+~aW?-{H;$M4iv9TBUsDRog?Y=+i66%z35gqk7v#2h;6p^Vs;jovm=B>2mVHdMOw)ICYm3{s=KijO*kS_ga&;L0ndUoh(LwRYH2@Y z+>jqe656@3?|u^ z3+(&N96&4~XZa<1B@j-DET92fc<6lKpSbXBIux15t(rQa4p>>}2C54$iVh{N{$VSu z54^5khz|+86Pf2-cA20v0gpuk<)Rf{5o*N#gE15j1tqZMMM!=Y%-vI?wi@Ps2#LN} z81a!UKLk~Gz?jlHfT)d!plXw(dXaG{tt3oux+;>#1YU9O+hE+a(Kd)O{UQY@70mw-1ZTm#@)iA&XanA30!k2|G zdFNm%T0q62U2N=wO`nGtw#MEJXxK_&-#NKA7Km8IwJ8P6QSPJ_&)SdPshlrW<<`&w zoA4f&l*}iWB3h*R8_Ky029+@>9L2J++g10J}T;wM8Lg{MGTLCbw8l060|&-uL{G#r0pyDOs1l?crbf zF^How0)a5yD_@4B_rmJ1jdc8%SB3@8e1-{S6romQ{(9p~3d>?`lTP;wqdYv_6c9lp@8Y4$Y``29r)}t~iXphz8J4^>K?QL7 z6WGH&&PU!Ez9yXz#Wi4hHy{FkWN=TFORqD2a!tGx`?O*Ku*uI5u5SK_?T7%j#7y)4 zyNZd4LEi`VEt?m)U}z6!$ud~_e$!06F#6DR&Pcxs#ryJeJg?8hAgg4>(h%K zDmaLLM+u}rX2;LG!d${s$6tAC1FKoG0-8_x9r?uh57Fnf!nBQ~YB1d%0>cP_PWC3M zkvKdow+9pAYCsCh|B#HUe27DWll4CVAoeCx!7-IEN_(+h0MZyX(q8N6k&N`|_J*=H zG8kXzSwtDiq)T!8Ie~)RGnt+r`QXT5T0wyM<>skkhlMOlTOr>DmLh2O%kFz`BA|ox zXm%oQ|9ckztY=e%z87svZstCt3#`{jQSMG>$_tzYi}C36E$aG_!8KM%<7Yb-E9-J_ z&4TS2ncs&3A%OqDgj2O2O_dc>{A-ax`&oBqqa@XFK>6D0SFf&3k^TF?XC_78dyxrK zRP><7rl)-C*AZkVcg3*C-<>H(CP!9hOL{)|CuYC8`|N0sQ4(B@)~65`1Q7a+2wPD0 z@J?9cmPNej@M?I`rzXUUPAr%l<)U!%yPIEV7@@HX4sbxV#-lq5WUR3X-t!4rf=-k* z#%ZA4RV_5vu4_CN+$za?oNaQ3!IzK2LfxtH`6>OC$_EwsDL`8<>+o}@ZVz>?`S~mZ z*GFwyzE)(Nc+!sURM6GoD{lYE9|`7%Ace2VGt_wMc|Z#FckaXfUhyh5sPU^y&>W%D^D?4%f30%!ZuM7VM)FPd#?D@MO^&PdVlhfa1MwYh z#xrv87r9lCb#{ic1(NZ)sbqSnOSzHyuNX0RWp%HsjGNL}F(8r3bqSzHI1&GY9e0x9 zDw@m1<^URZ1>TV)gnW7o%XvZ9oif2fs>E(c6wt)8pfX*M^bH+M|%cO;hWg!ytFsh{1-S-7lzM+y4EK zT)|Q9=KUi&YiDQO$7A6$oR(h@A_q&u4|w1*Gh`1&7oE;0K&hpXn0X7NNYqRX+e~0( zxx&8iF?=#$u?vGrD&F$u)nukI>t7y8R@&Uy^W-{;i6!tj(+R0+M1JUOvTHh;9cgA) z7S6l!BNj4C#50`UMXm0^b8 z+uxwMuRrIy=?5g|rRc4(c{h>lN#xG;!|e48_jj@T7%x@l^TKL8O70l;ZgQLGTl1GZog{LrskZa z)H*)|)SHvS1pRe9h36pEWzYHh#T=EITbC>z1_*KI1)iEsQ!s3&Gd~nWW)d>I%I)~i z+p=x=^dM4S9!1wi7Bbw=XMz?ClL?al83C2NRc?FJMxX6fXk@i=vyj(a&DAzQS4C;M zzRo|-V0a#rlT3R`Q5UG6H_7%!(`+#Jo;wh&;eb@nX2gJfC04j=dsH_=Z!%8@TMV2` zSF9AFb+~aEBV85%H5|#^a$zFH9CgM`?`?xmnuIP}q|c~?s{$%1Vf@T6`fc#3lN0>nLG}13cy&$=!d|5vi32C zA0+5?LMVne>3{=hS8_GbR&i-lasOrv9&iw-=Y>OFTs2$zmp!#Z_}G_2DZ@^vlC7JYn!g3ROrAZ%Z`M(l-1WreIc^Q)}iw^@HsZ` zs}okk=AxCQcHM5 z-WThgYlt9$8ZM&QOVeLHHT;ee1ve$F2zpSuIcpX(RKp46GjqS1h;-QE#^Ku;s`dH2 zC6NG>w==<%fcf`;!7u2nX{~@~#M0<^h<{2vW$7200~d^IMv-{eeGc%lsR(*6Pv}#^ z&P(aCQIwWoycgn@{=0a&NO-I@657NC1Z6+oJ3iK+ueM1SAJDq#y{?jEzNH#*9DHH= zZhR9%@u5(Lkjw5B!0)70bY*doP(DpLOo<`l6r(XOL4=|bm(5W*sX~2@9E03(F$qZn&OEG?E6I9sfv3bdo zH;1J}pI1eIr6lugr4k$Xmakq>RnZkLqL_pf2D?Sf($Ib3O(l)WNmc>#eFZi)iQ18y zyNqH+F#TAT@!KwHXOdJ^=Mh z&k1_9UnPl;w?}IJ9VOH145e^MX7%UNAe)ThKu(GG2!JVV*;f=POmnvoLRwU6KxZ~m zcnW_9NNl3CIx_lxS2-V7^SGNts*Axg13GnL16V`r@iSlhm>n9#vra#3;56)-%`czR z-C@euVsA|C5S17>fO=LiG|QClQ?C_W8*p`l799u#!!&6bfbiyd3huKeHv_tb!?i+7ZO9~cbPwZYT;^by-%O8aGD zUzBk$;qK^_=O#+E1ac<*sRIC6g6uOg_;I9IHh2(59ylhsS=8*`&8{JaORZc|-+TM% z8v(!Y>8J|y!4tOLJ0q;gf+h&A|GQay~kuE-4>JJYXFA6HzAC_cE zC?BZ{9JWbFSqN}IITD58_Y{~6>L1_1FccM`_Na{cwPFrjYd#q0~`NfbSZ| zIW=cxax{?T*fi%NUkbP~0@YUG^`ANU#iDIf^gShfY9S&*3OJ-4=&aZ8=Z?32g!qk^ zd~Mo*r(W7>_y7l5U{VhLBxrcn6T3KaCUTSItI|8k54b>ZJhX(Y#bdLPg^`p0UTDH@H5Yb2$EG|*1A61wf=NmhMoZ+)nW=Tz(#ul83wf68>u2?93z{CxKF zR~L@ynD@*Eo0(XjoIs@6-9@C?cvD}aVL+ySNW8LX*j9iQESK(_zxFZX(qLlD18lNb zx;C5%E@G|S)Zd=0T{5b=cps!o>`Ru-u~;;s&M+FiJ5!?!5XRffB29ko%+r_Fiq1+h z4?bd%_~URyVkK704QwG20rUG*AZp~PD)Z;8NYV55(Qb8FJAekut~!_0gNc*yveT3 zh#|w3Fu!-s-$&j_x;FMj`OjQ-SbjSe_{@D_abo4$NT2No1QTA(`0#X{8t;F`z(2Ln zFX#I7E^&RV;7?>VP69(pkD>j)a_->Rw{HN6_@{4_E*7CBZ~7^3Ryd{b9rGM zzY=~;4>EDuo$cf&5(mSC;4B&gLO%))zBJgjRP{F)Ij_<|)x5Cp*`oB5G?4m+EjbDfNO=1+v1{Z|mY?gF`SS9qMxrBy`sEPK+V;4PoLHpZ6*-LgS)5O{O)1fY9UwBh6uG@8mhDRCQ zBFr}$-~SzPY8Yde6V>u*FB*?KsQvs$6a?Hf@M*4|<}`bIZH+Uz5YjmU#($4c5MJ#5 zzS?bGnlM|r2T>Gs^Yu+qad*C_32Z8>iFEjTD9WW5hk_8hc0#k9e)a6K;p~>pn-Q1U zW%mOShbk2n?$aG7DN#_KbwU1eG7@8XE1&&0>YAeIkUBHBQ8PJNC4ugU;_gq|+Li^^ z^>eiix( zw%^^o_=av{%p|C;A@G$m2$><}Kr{O8EqI1nW*6Fbh4h9)E~^AG%yV)ACd{T{ z@%=4F4)We$HD$f3553$8$w;m1DpCP!tC-&5z|$?Hg>ZyP7{H)LhNe-SgdT|e@(_16 zo>=u16@xxrD#~RNx5buI`xS*W?hLm^IA6h?E0mCd_%Dv$%J_J@+I1S_tnmv2lF5*k z@efRYHU?{rj88DNU+xi~lAQCjVBzX=Z*>_elaO|3L4w}k)lZWhdC3k@JOZ(X7WF*Y zAGHT!45f~?q#JhVKI84v`*gB}s9aR{HDl#sbu4bn9Y&%H`PRYuR$OQJz zLJTeFhAZ~2Io=-#2vM^r!_vB~Pd`?e_-@WQLRd=ODYFlop1MzW{uCZcMeC>de91PP zYozWgA{W6>lhrnhV1avszDE;sKHSrlZaH}T+#EDq@6ptJ5l}KV0TM}6xboO%x^0Q3 z(z9wWBDOy^8vBwy=4o)g^F^){o(#b>;1G?55;0dG!>ZB6HK(;HpXJ`Vccx2f10%`Ii-A%y+g4!f zdD><_OGh=JuRIipG%WUhN%}U%sxY1H zauZ@NPAMb6A}AvA-18OOde8{w^I@@@(?@MCU?GLeTuwN($ zA0SNZ{(~YaVn3fy`J?<5xctN_n6QF04!Bz zC~O4N){K#fPonjT_iPe z<1XDJ^C{dV3KdX85Z?+m*1**inBL29#9gS*YpQYk80 zz)w-+iOB?MrZ^}sdQfq7%=FqbK`w*4)0!@uCMUAwvyC3`}ME85C=IVOP1iyTo#OVtl&^w8*FHwHEODTbASjS!vHVbQae*$b{@D6@b1n(vyjZB7Wb-A4IhmptgC|Cw?*R0ihczV8Kqb5hZ1GXBd{pb;Kf;T^= z%^x?XNXSd;sI)##sZ+K2mqKM+#?1@IRm4+se_k*uyV%t>djYnk4mvayO>cSvkH+4j z+@@Ai|D*fCiIV@i#UTQ>l7LU+u8%gvEwSpMZ^|ut$NZ&I^4@&nIkLsd0@$DV=?tW@ zxTLN{>MiWzz+l2b$j|;{*d3^MVl^(_c9a*ySo(f3k;fs!t`d5ozN4UMui$;CnIKO_ zT&rQ%6_Pb$`@WXi-r!6kBY36CYpI>4v1B!t%rURlF|KK7p|gj-ZUxGY4SPSjrMe6h zEhaA7_#&+nFRG5n&CE;e_HQ#PV=0U0j$U;YCf2o-(oGeTSM#ir7W;+#yfcW>wNXyR zd97T(du`OlU^n^2kNB4ZTI$3m8$@8nTcvV@rYP@F`@?6q&QiQu4y(}xdt4n#X&1t* zUxT7W3ewq*4YRi(#d10GytzigKtlh4p(&s6l#soMH48@llHp22mNNUx?6Yq@Em%Sw zt#I~8n00{V-{8_S{H$~Vl(%#cJ}%8H;@oAG)T7s?NB2%&(yNlZFP9}H1?TMN6S**> zbkjV=pP2#)ft`l>f`sonLDC zpdRFM)i+KwD|lt*F^}53&T=&&9`om*9c-Z^vZG(g-=r1ka<>#rtFeVxEm*y2o|21Z zko^4t?TI9Q4`KX8RYy2EzNQWGl~#9{pdL$ky&%^Ly}gd9gWu}W-Dw-`)|zx}zL5Tp zlCFzdn^AE3z$+%mF1<46P2CRa)~u7!scHs8@Wuz57}}uu?$kdO%hkIA*Jy-OlA2DR z6{+^HI;RctK~A>YI~OAPdvgzEQ1o3!#9|>Y(k1nzevE5qVHkBu<|GW+Y>?(#Rb+V* z=`W9-s;SFqb}sYhG_SHgX`9i{^Io@@QteN-pY118G%<}+=w|FJ_$5tI|5~@CJtEs2 z7%%pA>k8FP#poA6gc7nE9{mZ6AiG?|MxZ{WwO#bZUv51nOz-aO$HtRdxfE{(YOUR~ z#s%H%!M(s|PekO5oUuW_Pq*Up4GaJ3EvDVWvKObMj^Z)+zE|kr<|$n(H)cjjuEUcjW z7`3B5e|Xjtq%_0beU40M$)r1EZ0q=UyB-cU*CWo3)oQG>vz1I<8P0G@2ze}%D7>~6PTH|Z%Id96!+33VL_GVjTVoVQZ&}@^w~VwHViaVPZ+C0FQrC~P5bu?r45ZG zlsB76w;T;0K6Gqg|Ej_CgWUb0()(du?Ivx8UeK1vtD*}h{oqL#nGO%egWud&?@ZXe zQ)ya1ptkOV(oYx38E^kly1kh)K@$p$ol#nd|E|Q^x$kzLrD?Rg;3-+7n{8l*spM~GNVvJWv2bUNJA0c&-!3p_RAf!fzHdyPw{OoTGb4idcN(jVec@MSC$~O) z9Ha-MEjg+vfxoRVtQSP{5uoS2jm21gf%?W&bBrY|9Ij95G4c>kZeu>c)e(N>6$xQ3 z#~%3C5#p9Jq)8YX#kD?4jJeP{8Yr3KC^Q;kI;ZS7qA564gHm-NJpZ9#?TC+XN-7wp zInfy7kIglip>1Q)oyr~3(q(lApE>sYX8XZ_l$;TDF$c*@`b0`@g#WxN7pYRyj+Y0z z-#EKxrlHWg)t&0J31b2+**W)#^QJ62ze`Frtd^4;ibjKrTn>*2njif%`;(QiBBlWg z7PiRdvvF>Eu-fNpU3%5x40SVU7qjmrnXljmZ3vFh6eXWFYdSb7^~q+_GX_uk=ZHaW zj)-O47OINf7FNERYE@oY6|sRO10JbBr}b`qFWJfXfNb@avat&uK6P%k=Oa11aY?)_ zJR7H?|MBdDDfe#itV`-XM?=*B9c9&RVpE}s9sl}mB3tC|90CilPJgn7H8b}${oD~B0G z=6OaMY2#!E%F>Gn$tK$~}A8gJKwHNrC{Df8#`lME>mSB1Oo@XM2~60S|{jLARCE&?LtdxHnPM&<&?Dx9vx zfxE=_N35Tdp%xfYa_K%C)Yl7aJjMuKA^|?G>D$$s^-k{}&-%9e)7B)E;um?l_X&7N zO`S7ia{1c2thc#`?Ro#^F6h)>*>Jo$r)w=dqS`c*;}m(cW%BLe^GF|c>||Ws=>6w- zuJOb?;wQH(^lN(7p&@oigt5O#27NEYvX=AdVaBg>nw9qTLIKSUIhfJ)J>_3(ZaaaJ z*|sKC*$*F=kKmxrH?eZ_-K@-d*d949-;$knbl}jpFR=dn4UT)mHxz@-eUqZXRxYTs z&WmJCVUkI-skQYMsi+*Qb^8PNd`eAczw>cMymGOGb(jo!5$o)XORR{DB2t)=9EQZaegGAN^}jGBDpv;bd0B13>)mEQV!A2ybzcs6de>a51;(F3 z(sz%3p-uteWU{t246SJ$4*^FjLK4|2mX5K`#osV&%= zr-GA-?K&fds2KL?M3s4&DW0r99K1yG*zlXRo^WTeB5>lIm=+jTc<=fZXY%jM`bxa+ zA6X;Lotr~}6-5Ih2(6B0e|V|`D~m5(x?cJY|2`r!1C04EgomylR(*bU>Fe}7o~b?u28xDgg@L@k2;7JA6t?MBy*G<1-`R>y9&`=-L4!hfz^Xp6pkE8<<+ z(rNvU*;^=}tkt4lfCrwMx9PraIU)Bxz(K*q7egIx;~T-W$v%ImG8BD*E1vw_6n28M z+}-;mW}&B*9}CG?36<{l>OXGO5KONM-Vk-C0#`-pcD$msMC}!VvbVtH)6PxZ0nO#s zcDK1)n}b8P7KbA@zm=gj+aQf_bda54DOZr@q-} z`kM-|W+7b+b|joh_RZE0H>B8uNHZrCWmEP#ra|=951NWmTuhkio@S-uTS6FK2I(2R zcY`aY!%-kHa;JLXgtn6Ye&kC{y=qCdQ|Wj8en$D*I8O}{+6v^VFG!_J)j}qdHqT}q zcDQR>1+*I!>Zo_BeJWmR+&OvZAhjlpCoJ(!VSYCCr!=>}vaoAGn^UTYmGYgkW5SJn zd2<*`$L4m+7Q&f%-PLI$K*C=CdpxR>>bx*YgVUyF1H)r{`5WXu<_Y+i+k7hvpL&3B z4m*!xWsSh)RYBa8bY7Gl1m-37i^V5$vzNO1VmoQafk zHYsW!A|3S+d>(Ik#B5@|P+RLK3dVr5w;2&y{ons)aL8pQyDxOR%~UfAs={Z_ z)lq>@@#)#z*~g8TSa}M})M=`7hS{{`V*HC#&-0ea*5R4#S%}DW$Pt)pw9Rn=Z&#$x z`+yirQfMSB#}yoiQ4 zjcQw;8xUoXQ_WdIgsfIccW*U~b(5WBnOsRY^4z_h;fXK*p%r#dj^7p? ze1VyJu;WH{*~;DdZBU&7GN>{65^OH|>HfaOg@q5ay0~e_X0lC}TR;uo5`|Vw{IPdy z@~km&=;C;=@$+qb|8WrS^HG(j|2M3qwvMUs%8{DiW}Ca)Co~h8 X^M{vdN:/opt/docs webdevops/sphinx sphinx-autobuild -H 0.0.0.0 /opt/docs html -``` diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile deleted file mode 100644 index 14ed6ab1e..000000000 --- a/docker/typo3-solr/3.1/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:3.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM guywithnose/solr:4.10.4 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - -COPY ./solr/ /tmp/solr - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 deleted file mode 100644 index 46c89bade..000000000 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ /dev/null @@ -1,30 +0,0 @@ - -{{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} - -{{ docker.version() }} - -{{ environment.general() }} - -USER root - -COPY ./solr/ /tmp/solr - -{{ baselayout.copy() }} - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/3.1/solr/solr.xml b/docker/typo3-solr/3.1/solr/solr.xml deleted file mode 100644 index d29f9f3c4..000000000 --- a/docker/typo3-solr/3.1/solr/solr.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/admin-extra.html b/docker/typo3-solr/3.1/solr/typo3cores/conf/admin-extra.html deleted file mode 100644 index b68131ad9..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/admin-extra.html +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json deleted file mode 100644 index 580df1738..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:57.000Z", - "managedList": [ - "من", - "ومن", - "منها", - "منه", - "في", - "وفي", - "فيها", - "فيه", - "و", - "ف", - "ثم", - "او", - "أو", - "ب", - "بها", - "به", - "ا", - "أ", - "اى", - "اي", - "أي", - "أى", - "لا", - "ولا", - "الا", - "ألا", - "إلا", - "لكن", - "ما", - "وما", - "كما", - "فما", - "عن", - "مع", - "اذا", - "إذا", - "ان", - "أن", - "إن", - "انها", - "أنها", - "إنها", - "انه", - "أنه", - "إنه", - "بان", - "بأن", - "فان", - "فأن", - "وان", - "وأن", - "وإن", - "التى", - "التي", - "الذى", - "الذي", - "الذين", - "الى", - "الي", - "إلى", - "إلي", - "على", - "عليها", - "عليه", - "اما", - "أما", - "إما", - "ايضا", - "أيضا", - "كل", - "وكل", - "لم", - "ولم", - "لن", - "ولن", - "هى", - "هي", - "هو", - "وهى", - "وهي", - "وهو", - "فهى", - "فهي", - "فهو", - "انت", - "أنت", - "لك", - "لها", - "له", - "هذه", - "هذا", - "تلك", - "ذلك", - "هناك", - "كانت", - "كان", - "يكون", - "تكون", - "وكانت", - "وكان", - "غير", - "بعض", - "قد", - "نحو", - "بين", - "بينما", - "منذ", - "ضمن", - "حيث", - "الان", - "الآن", - "خلال", - "بعد", - "قبل", - "حتى", - "عند", - "عندما", - "لدى", - "جميع" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/schema.xml deleted file mode 100644 index 67c42e3c6..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/schema.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/arabic/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json deleted file mode 100644 index 413654a72..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "այդ", - "այլ", - "այն", - "այս", - "դու", - "դուք", - "եմ", - "են", - "ենք", - "ես", - "եք", - "է", - "էի", - "էին", - "էինք", - "էիր", - "էիք", - "էր", - "ըստ", - "թ", - "ի", - "ին", - "իսկ", - "իր", - "կամ", - "համար", - "հետ", - "հետո", - "մենք", - "մեջ", - "մի", - "ն", - "նա", - "նաև", - "նրա", - "նրանք", - "որ", - "որը", - "որոնք", - "որպես", - "ու", - "ում", - "պիտի", - "վրա", - "և" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/schema.xml deleted file mode 100644 index 7b0add92f..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/schema.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/armenian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json deleted file mode 100644 index b440eaef8..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "al", - "anitz", - "arabera", - "asko", - "baina", - "bat", - "batean", - "batek", - "bati", - "batzuei", - "batzuek", - "batzuetan", - "batzuk", - "bera", - "beraiek", - "berau", - "berauek", - "bere", - "berori", - "beroriek", - "beste", - "bezala", - "da", - "dago", - "dira", - "ditu", - "du", - "dute", - "edo", - "egin", - "ere", - "eta", - "eurak", - "ez", - "gainera", - "gu", - "gutxi", - "guzti", - "haiei", - "haiek", - "haietan", - "hainbeste", - "hala", - "han", - "handik", - "hango", - "hara", - "hari", - "hark", - "hartan", - "hau", - "hauei", - "hauek", - "hauetan", - "hemen", - "hemendik", - "hemengo", - "hi", - "hona", - "honek", - "honela", - "honetan", - "honi", - "hor", - "hori", - "horiei", - "horiek", - "horietan", - "horko", - "horra", - "horrek", - "horrela", - "horretan", - "horri", - "hortik", - "hura", - "izan", - "ni", - "noiz", - "nola", - "non", - "nondik", - "nongo", - "nor", - "nora", - "ze", - "zein", - "zen", - "zenbait", - "zenbat", - "zer", - "zergatik", - "ziren", - "zituen", - "zu", - "zuek", - "zuen", - "zuten" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/schema.xml deleted file mode 100644 index 0e5812801..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/basque/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json deleted file mode 100644 index b30edf7a9..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "ainda", - "alem", - "ambas", - "ambos", - "antes", - "ao", - "aonde", - "aos", - "apos", - "aquele", - "aqueles", - "as", - "assim", - "com", - "como", - "contra", - "contudo", - "cuja", - "cujas", - "cujo", - "cujos", - "da", - "das", - "de", - "dela", - "dele", - "deles", - "demais", - "depois", - "desde", - "desta", - "deste", - "dispoe", - "dispoem", - "diversa", - "diversas", - "diversos", - "do", - "dos", - "durante", - "e", - "ela", - "elas", - "ele", - "eles", - "em", - "entao", - "entre", - "essa", - "essas", - "esse", - "esses", - "esta", - "estas", - "este", - "estes", - "ha", - "isso", - "isto", - "logo", - "mais", - "mas", - "mediante", - "menos", - "mesma", - "mesmas", - "mesmo", - "mesmos", - "na", - "nas", - "nao", - "nas", - "nem", - "nesse", - "neste", - "nos", - "o", - "os", - "ou", - "outra", - "outras", - "outro", - "outros", - "pelas", - "pelas", - "pelo", - "pelos", - "perante", - "pois", - "por", - "porque", - "portanto", - "proprio", - "propios", - "quais", - "qual", - "qualquer", - "quando", - "quanto", - "que", - "quem", - "quer", - "se", - "seja", - "sem", - "sendo", - "seu", - "seus", - "sob", - "sobre", - "sua", - "suas", - "tal", - "tambem", - "teu", - "teus", - "toda", - "todas", - "todo", - "todos", - "tua", - "tuas", - "tudo", - "um", - "uma", - "umas", - "uns" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/schema.xml deleted file mode 100644 index 4d3f3a272..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/schema.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json deleted file mode 100644 index 52bd7cb5c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "а", - "аз", - "ако", - "ала", - "бе", - "без", - "беше", - "би", - "бил", - "била", - "били", - "било", - "близо", - "бъдат", - "бъде", - "бяха", - "в", - "вас", - "ваш", - "ваша", - "вероятно", - "вече", - "взема", - "ви", - "вие", - "винаги", - "все", - "всеки", - "всички", - "всичко", - "всяка", - "във", - "въпреки", - "върху", - "г", - "ги", - "главно", - "го", - "д", - "да", - "дали", - "до", - "докато", - "докога", - "дори", - "досега", - "доста", - "е", - "едва", - "един", - "ето", - "за", - "зад", - "заедно", - "заради", - "засега", - "затова", - "защо", - "защото", - "и", - "из", - "или", - "им", - "има", - "имат", - "иска", - "й", - "каза", - "как", - "каква", - "какво", - "както", - "какъв", - "като", - "кога", - "когато", - "което", - "които", - "кой", - "който", - "колко", - "която", - "къде", - "където", - "към", - "ли", - "м", - "ме", - "между", - "мен", - "ми", - "мнозина", - "мога", - "могат", - "може", - "моля", - "момента", - "му", - "н", - "на", - "над", - "назад", - "най", - "направи", - "напред", - "например", - "нас", - "не", - "него", - "нея", - "ни", - "ние", - "никой", - "нито", - "но", - "някои", - "някой", - "няма", - "обаче", - "около", - "освен", - "особено", - "от", - "отгоре", - "отново", - "още", - "пак", - "по", - "повече", - "повечето", - "под", - "поне", - "поради", - "после", - "почти", - "прави", - "пред", - "преди", - "през", - "при", - "пък", - "първо", - "с", - "са", - "само", - "се", - "сега", - "си", - "скоро", - "след", - "сме", - "според", - "сред", - "срещу", - "сте", - "съм", - "със", - "също", - "т", - "тази", - "така", - "такива", - "такъв", - "там", - "твой", - "те", - "тези", - "ти", - "тн", - "то", - "това", - "тогава", - "този", - "той", - "толкова", - "точно", - "трябва", - "тук", - "тъй", - "тя", - "тях", - "у", - "харесва", - "ч", - "че", - "често", - "чрез", - "ще", - "щом", - "я" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/schema.xml deleted file mode 100644 index 3b06afdf6..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/schema.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/bulgarian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/readme.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/schema.xml deleted file mode 100644 index 06017fca8..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/burmese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json deleted file mode 100644 index 45bf23de8..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "abans", - "ací", - "ah", - "així", - "això", - "al", - "als", - "aleshores", - "algun", - "alguna", - "algunes", - "alguns", - "alhora", - "allà", - "allí", - "allò", - "altra", - "altre", - "altres", - "amb", - "ambdós", - "ambdues", - "apa", - "aquell", - "aquella", - "aquelles", - "aquells", - "aquest", - "aquesta", - "aquestes", - "aquests", - "aquí", - "baix", - "cada", - "cadascú", - "cadascuna", - "cadascunes", - "cadascuns", - "com", - "contra", - "d'un", - "d'una", - "d'unes", - "d'uns", - "dalt", - "de", - "del", - "dels", - "des", - "després", - "dins", - "dintre", - "donat", - "doncs", - "durant", - "e", - "eh", - "el", - "els", - "em", - "en", - "encara", - "ens", - "entre", - "érem", - "eren", - "éreu", - "es", - "és", - "esta", - "està", - "estàvem", - "estaven", - "estàveu", - "esteu", - "et", - "etc", - "ets", - "fins", - "fora", - "gairebé", - "ha", - "han", - "has", - "havia", - "he", - "hem", - "heu", - "hi", - "ho", - "i", - "igual", - "iguals", - "ja", - "l'hi", - "la", - "les", - "li", - "li'n", - "llavors", - "m'he", - "ma", - "mal", - "malgrat", - "mateix", - "mateixa", - "mateixes", - "mateixos", - "me", - "mentre", - "més", - "meu", - "meus", - "meva", - "meves", - "molt", - "molta", - "moltes", - "molts", - "mon", - "mons", - "n'he", - "n'hi", - "ne", - "ni", - "no", - "nogensmenys", - "només", - "nosaltres", - "nostra", - "nostre", - "nostres", - "o", - "oh", - "oi", - "on", - "pas", - "pel", - "pels", - "per", - "però", - "perquè", - "poc", - "poca", - "pocs", - "poques", - "potser", - "propi", - "qual", - "quals", - "quan", - "quant", - "que", - "què", - "quelcom", - "qui", - "quin", - "quina", - "quines", - "quins", - "s'ha", - "s'han", - "sa", - "semblant", - "semblants", - "ses", - "seu", - "seus", - "seva", - "seva", - "seves", - "si", - "sobre", - "sobretot", - "sóc", - "solament", - "sols", - "son", - "són", - "sons", - "sota", - "sou", - "t'ha", - "t'han", - "t'he", - "ta", - "tal", - "també", - "tampoc", - "tan", - "tant", - "tanta", - "tantes", - "teu", - "teus", - "teva", - "teves", - "ton", - "tons", - "tot", - "tota", - "totes", - "tots", - "un", - "una", - "unes", - "uns", - "us", - "va", - "vaig", - "vam", - "van", - "vas", - "veu", - "vosaltres", - "vostra", - "vostre", - "vostres" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/schema.xml deleted file mode 100644 index 0070bd48e..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/schema.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/catalan/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/schema.xml deleted file mode 100644 index 0f5c86c72..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/chinese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/currency.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/currency.xml deleted file mode 100644 index 4d77aebd0..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/currency.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json deleted file mode 100644 index e08e8ab2d..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "s", - "k", - "o", - "i", - "u", - "v", - "z", - "dnes", - "cz", - "tímto", - "budeš", - "budem", - "byli", - "jseš", - "můj", - "svým", - "ta", - "tomto", - "tohle", - "tuto", - "tyto", - "jej", - "zda", - "proč", - "máte", - "tato", - "kam", - "tohoto", - "kdo", - "kteří", - "mi", - "nám", - "tom", - "tomuto", - "mít", - "nic", - "proto", - "kterou", - "byla", - "toho", - "protože", - "asi", - "ho", - "naši", - "napište", - "re", - "což", - "tím", - "takže", - "svých", - "její", - "svými", - "jste", - "aj", - "tu", - "tedy", - "teto", - "bylo", - "kde", - "ke", - "pravé", - "ji", - "nad", - "nejsou", - "či", - "pod", - "téma", - "mezi", - "přes", - "ty", - "pak", - "vám", - "ani", - "když", - "však", - "neg", - "jsem", - "tento", - "článku", - "články", - "aby", - "jsme", - "před", - "pta", - "jejich", - "byl", - "ještě", - "až", - "bez", - "také", - "pouze", - "první", - "vaše", - "která", - "nás", - "nový", - "tipy", - "pokud", - "může", - "strana", - "jeho", - "své", - "jiné", - "zprávy", - "nové", - "není", - "vás", - "jen", - "podle", - "zde", - "už", - "být", - "více", - "bude", - "již", - "než", - "který", - "by", - "které", - "co", - "nebo", - "ten", - "tak", - "má", - "při", - "od", - "po", - "jsou", - "jak", - "další", - "ale", - "si", - "se", - "ve", - "to", - "jako", - "za", - "zpět", - "ze", - "do", - "pro", - "je", - "na", - "atd", - "atp", - "jakmile", - "přičemž", - "já", - "on", - "ona", - "ono", - "oni", - "ony", - "my", - "vy", - "jí", - "ji", - "mě", - "mne", - "jemu", - "tomu", - "těm", - "těmu", - "němu", - "němuž", - "jehož", - "jíž", - "jelikož", - "jež", - "jakož", - "načež" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/schema.xml deleted file mode 100644 index 3cf31d2ab..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/czech/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json deleted file mode 100644 index 9491bd7b5..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "og", - "i", - "jeg", - "det", - "at", - "en", - "den", - "til", - "er", - "som", - "på", - "de", - "med", - "han", - "af", - "for", - "ikke", - "der", - "var", - "mig", - "sig", - "men", - "et", - "har", - "om", - "vi", - "min", - "havde", - "ham", - "hun", - "nu", - "over", - "da", - "fra", - "du", - "ud", - "sin", - "dem", - "os", - "op", - "man", - "hans", - "hvor", - "eller", - "hvad", - "skal", - "selv", - "her", - "alle", - "vil", - "blev", - "kunne", - "ind", - "når", - "være", - "dog", - "noget", - "ville", - "jo", - "deres", - "efter", - "ned", - "skulle", - "denne", - "end", - "dette", - "mit", - "også", - "under", - "have", - "dig", - "anden", - "hende", - "mine", - "alt", - "meget", - "sit", - "sine", - "vor", - "mod", - "disse", - "hvis", - "din", - "nogle", - "hos", - "blive", - "mange", - "ad", - "bliver", - "hendes", - "været", - "thi", - "jer", - "sådan" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/protwords.txt deleted file mode 100644 index c0be26e39..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/protwords.txt +++ /dev/null @@ -1,17 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/schema.xml deleted file mode 100644 index bdbd6b7ef..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/schema.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/danish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json deleted file mode 100644 index 9a1448309..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "en", - "van", - "ik", - "te", - "dat", - "die", - "in", - "een", - "hij", - "het", - "niet", - "zijn", - "is", - "was", - "op", - "aan", - "met", - "als", - "voor", - "had", - "er", - "maar", - "om", - "hem", - "dan", - "zou", - "of", - "wat", - "mijn", - "men", - "dit", - "zo", - "door", - "over", - "ze", - "zich", - "bij", - "ook", - "tot", - "je", - "mij", - "uit", - "der", - "daar", - "haar", - "naar", - "heb", - "hoe", - "heeft", - "hebben", - "deze", - "u", - "want", - "nog", - "zal", - "me", - "zij", - "nu", - "ge", - "geen", - "omdat", - "iets", - "worden", - "toch", - "al", - "waren", - "veel", - "meer", - "doen", - "toen", - "moet", - "ben", - "zonder", - "kan", - "hun", - "dus", - "alles", - "onder", - "ja", - "eens", - "hier", - "wie", - "werd", - "altijd", - "doch", - "wordt", - "wezen", - "kunnen", - "ons", - "zelf", - "tegen", - "na", - "reeds", - "wil", - "kon", - "niets", - "uw", - "iemand", - "geweest", - "andere" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/schema.xml deleted file mode 100644 index 334cf39b2..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/schema.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/dutch/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/elevate.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/elevate.xml deleted file mode 100644 index 7630ebe20..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json deleted file mode 100644 index ffc7fbdc9..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "i", - "me", - "my", - "myself", - "we", - "us", - "our", - "ours", - "ourselves", - "you", - "your", - "yours", - "yourself", - "yourselves", - "he", - "him", - "his", - "himself", - "she", - "her", - "hers", - "herself", - "it", - "its", - "itself", - "they", - "them", - "their", - "theirs", - "themselves", - "what", - "which", - "who", - "whom", - "this", - "that", - "these", - "those", - "am", - "is", - "are", - "was", - "were", - "be", - "been", - "being", - "have", - "has", - "had", - "having", - "do", - "does", - "did", - "doing", - "would", - "should", - "could", - "ought", - "i'm", - "you're", - "he's", - "she's", - "it's", - "we're", - "they're", - "i've", - "you've", - "we've", - "they've", - "i'd", - "you'd", - "he'd", - "she'd", - "we'd", - "they'd", - "i'll", - "you'll", - "he'll", - "she'll", - "we'll", - "they'll", - "isn't", - "aren't", - "wasn't", - "weren't", - "hasn't", - "haven't", - "hadn't", - "doesn't", - "don't", - "didn't", - "won't", - "wouldn't", - "shan't", - "shouldn't", - "can't", - "cannot", - "couldn't", - "mustn't", - "let's", - "that's", - "who's", - "what's", - "here's", - "there's", - "when's", - "where's", - "why's", - "how's", - "an", - "the", - "and", - "but", - "if", - "or", - "because", - "as", - "until", - "while", - "of", - "at", - "by", - "for", - "with", - "about", - "against", - "between", - "into", - "through", - "during", - "before", - "after", - "above", - "below", - "to", - "from", - "up", - "down", - "in", - "out", - "on", - "off", - "over", - "under", - "again", - "further", - "then", - "once", - "here", - "there", - "when", - "where", - "why", - "how", - "all", - "any", - "both", - "each", - "few", - "more", - "most", - "other", - "some", - "such", - "no", - "nor", - "not", - "only", - "own", - "same", - "so", - "than", - "too", - "very" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/english/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/english/schema.xml deleted file mode 100644 index f279577f3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/schema.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/english/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/english/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json deleted file mode 100644 index 8705e10ea..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "olla", - "olen", - "olet", - "on", - "olemme", - "olette", - "ovat", - "ole", - "oli", - "olisi", - "olisit", - "olisin", - "olisimme", - "olisitte", - "olisivat", - "olit", - "olin", - "olimme", - "olitte", - "olivat", - "ollut", - "olleet", - "en", - "et", - "ei", - "emme", - "ette", - "eivät", - "minä", - "minun", - "minut", - "minua", - "minussa", - "minusta", - "minuun", - "minulla", - "minulta", - "minulle", - "sinä", - "sinun", - "sinut", - "sinua", - "sinussa", - "sinusta", - "sinuun", - "sinulla", - "sinulta", - "sinulle", - "hän", - "hänen", - "hänet", - "häntä", - "hänessä", - "hänestä", - "häneen", - "hänellä", - "häneltä", - "hänelle", - "me", - "meidän", - "meidät", - "meitä", - "meissä", - "meistä", - "meihin", - "meillä", - "meiltä", - "meille", - "te", - "teidän", - "teidät", - "teitä", - "teissä", - "teistä", - "teihin", - "teillä", - "teiltä", - "teille", - "he", - "heidän", - "heidät", - "heitä", - "heissä", - "heistä", - "heihin", - "heillä", - "heiltä", - "heille", - "tämä", - "tämän", - "tätä", - "tässä", - "tästä", - "tähän", - "tallä", - "tältä", - "tälle", - "tänä", - "täksi", - "tuo", - "tuon", - "tuotä", - "tuossa", - "tuosta", - "tuohon", - "tuolla", - "tuolta", - "tuolle", - "tuona", - "tuoksi", - "se", - "sen", - "sitä", - "siinä", - "siitä", - "siihen", - "sillä", - "siltä", - "sille", - "sinä", - "siksi", - "nämä", - "näiden", - "näitä", - "näissä", - "näistä", - "näihin", - "näillä", - "näiltä", - "näille", - "näinä", - "näiksi", - "nuo", - "noiden", - "noita", - "noissa", - "noista", - "noihin", - "noilla", - "noilta", - "noille", - "noina", - "noiksi", - "ne", - "niiden", - "niitä", - "niissä", - "niistä", - "niihin", - "niillä", - "niiltä", - "niille", - "niinä", - "niiksi", - "kuka", - "kenen", - "kenet", - "ketä", - "kenessä", - "kenestä", - "keneen", - "kenellä", - "keneltä", - "kenelle", - "kenenä", - "keneksi", - "ketkä", - "keiden", - "ketkä", - "keitä", - "keissä", - "keistä", - "keihin", - "keillä", - "keiltä", - "keille", - "keinä", - "keiksi", - "mikä", - "minkä", - "minkä", - "mitä", - "missä", - "mistä", - "mihin", - "millä", - "miltä", - "mille", - "minä", - "miksi", - "mitkä", - "joka", - "jonka", - "jota", - "jossa", - "josta", - "johon", - "jolla", - "jolta", - "jolle", - "jona", - "joksi", - "jotka", - "joiden", - "joita", - "joissa", - "joista", - "joihin", - "joilla", - "joilta", - "joille", - "joina", - "joiksi", - "että", - "ja", - "jos", - "koska", - "kuin", - "mutta", - "niin", - "sekä", - "sillä", - "tai", - "vaan", - "vai", - "vaikka", - "kanssa", - "mukaan", - "noin", - "poikki", - "yli", - "kun", - "niin", - "nyt", - "itse" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/schema.xml deleted file mode 100644 index c1607ba2f..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/schema.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/finnish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json deleted file mode 100644 index 849e58721..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "au", - "aux", - "avec", - "ce", - "ces", - "dans", - "de", - "des", - "du", - "elle", - "en", - "et", - "eux", - "il", - "je", - "la", - "le", - "leur", - "lui", - "ma", - "mais", - "me", - "même", - "mes", - "moi", - "mon", - "ne", - "nos", - "notre", - "nous", - "on", - "ou", - "par", - "pas", - "pour", - "qu", - "que", - "qui", - "sa", - "se", - "ses", - "son", - "sur", - "ta", - "te", - "tes", - "toi", - "ton", - "tu", - "un", - "une", - "vos", - "votre", - "vous", - "c", - "d", - "j", - "l", - "à", - "m", - "n", - "s", - "t", - "y", - "été", - "étée", - "étées", - "étés", - "étant", - "suis", - "es", - "est", - "sommes", - "êtes", - "sont", - "serai", - "seras", - "sera", - "serons", - "serez", - "seront", - "serais", - "serait", - "serions", - "seriez", - "seraient", - "étais", - "était", - "étions", - "étiez", - "étaient", - "fus", - "fut", - "fûmes", - "fûtes", - "furent", - "sois", - "soit", - "soyons", - "soyez", - "soient", - "fusse", - "fusses", - "fût", - "fussions", - "fussiez", - "fussent", - "ayant", - "eu", - "eue", - "eues", - "eus", - "ai", - "as", - "avons", - "avez", - "ont", - "aurai", - "auras", - "aura", - "aurons", - "aurez", - "auront", - "aurais", - "aurait", - "aurions", - "auriez", - "auraient", - "avais", - "avait", - "avions", - "aviez", - "avaient", - "eut", - "eûmes", - "eûtes", - "eurent", - "aie", - "aies", - "ait", - "ayons", - "ayez", - "aient", - "eusse", - "eusses", - "eût", - "eussions", - "eussiez", - "eussent", - "ceci", - "celà", - "cet", - "cette", - "ici", - "ils", - "les", - "leurs", - "quel", - "quels", - "quelle", - "quelles", - "sans", - "soi" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/french/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/french/schema.xml deleted file mode 100644 index a64f975ee..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/schema.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/french/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/french/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json deleted file mode 100644 index 62cbf4114..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "aínda", - "alí", - "aquel", - "aquela", - "aquelas", - "aqueles", - "aquilo", - "aquí", - "ao", - "aos", - "as", - "así", - "á", - "ben", - "cando", - "che", - "co", - "coa", - "comigo", - "con", - "connosco", - "contigo", - "convosco", - "coas", - "cos", - "cun", - "cuns", - "cunha", - "cunhas", - "da", - "dalgunha", - "dalgunhas", - "dalgún", - "dalgúns", - "das", - "de", - "del", - "dela", - "delas", - "deles", - "desde", - "deste", - "do", - "dos", - "dun", - "duns", - "dunha", - "dunhas", - "e", - "el", - "ela", - "elas", - "eles", - "en", - "era", - "eran", - "esa", - "esas", - "ese", - "eses", - "esta", - "estar", - "estaba", - "está", - "están", - "este", - "estes", - "estiven", - "estou", - "eu", - "é", - "facer", - "foi", - "foron", - "fun", - "había", - "hai", - "iso", - "isto", - "la", - "las", - "lle", - "lles", - "lo", - "los", - "mais", - "me", - "meu", - "meus", - "min", - "miña", - "miñas", - "moi", - "na", - "nas", - "neste", - "nin", - "no", - "non", - "nos", - "nosa", - "nosas", - "noso", - "nosos", - "nós", - "nun", - "nunha", - "nuns", - "nunhas", - "o", - "os", - "ou", - "ó", - "ós", - "para", - "pero", - "pode", - "pois", - "pola", - "polas", - "polo", - "polos", - "por", - "que", - "se", - "senón", - "ser", - "seu", - "seus", - "sexa", - "sido", - "sobre", - "súa", - "súas", - "tamén", - "tan", - "te", - "ten", - "teñen", - "teño", - "ter", - "teu", - "teus", - "ti", - "tido", - "tiña", - "tiven", - "túa", - "túas", - "un", - "unha", - "unhas", - "uns", - "vos", - "vosa", - "vosas", - "voso", - "vosos", - "vós" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/schema.xml deleted file mode 100644 index 6d8d68130..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/schema.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/galician/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_fields.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_fields.xml deleted file mode 100644 index d84dcff5c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_fields.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_types.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_types.xml deleted file mode 100644 index 0776326f0..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/general_schema_types.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/schema.xml deleted file mode 100644 index faaadd038..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/schema.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/generic/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json deleted file mode 100644 index 1cffba337..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "aber", - "alle", - "allem", - "allen", - "aller", - "alles", - "als", - "also", - "am", - "an", - "ander", - "andere", - "anderem", - "anderen", - "anderer", - "anderes", - "anderm", - "andern", - "anderr", - "anders", - "auch", - "auf", - "aus", - "bei", - "bin", - "bis", - "bist", - "da", - "damit", - "dann", - "der", - "den", - "des", - "dem", - "die", - "das", - "daß", - "derselbe", - "derselben", - "denselben", - "desselben", - "demselben", - "dieselbe", - "dieselben", - "dasselbe", - "dazu", - "dein", - "deine", - "deinem", - "deinen", - "deiner", - "deines", - "denn", - "derer", - "dessen", - "dich", - "dir", - "du", - "dies", - "diese", - "diesem", - "diesen", - "dieser", - "dieses", - "doch", - "dort", - "durch", - "ein", - "eine", - "einem", - "einen", - "einer", - "eines", - "einig", - "einige", - "einigem", - "einigen", - "einiger", - "einiges", - "einmal", - "er", - "ihn", - "ihm", - "es", - "etwas", - "euer", - "eure", - "eurem", - "euren", - "eurer", - "eures", - "für", - "gegen", - "gewesen", - "hab", - "habe", - "haben", - "hat", - "hatte", - "hatten", - "hier", - "hin", - "hinter", - "ich", - "mich", - "mir", - "ihr", - "ihre", - "ihrem", - "ihren", - "ihrer", - "ihres", - "euch", - "im", - "in", - "indem", - "ins", - "ist", - "jede", - "jedem", - "jeden", - "jeder", - "jedes", - "jene", - "jenem", - "jenen", - "jener", - "jenes", - "jetzt", - "kann", - "kein", - "keine", - "keinem", - "keinen", - "keiner", - "keines", - "können", - "könnte", - "machen", - "man", - "manche", - "manchem", - "manchen", - "mancher", - "manches", - "mein", - "meine", - "meinem", - "meinen", - "meiner", - "meines", - "mit", - "muss", - "musste", - "nach", - "nicht", - "nichts", - "noch", - "nun", - "nur", - "ob", - "oder", - "ohne", - "sehr", - "sein", - "seine", - "seinem", - "seinen", - "seiner", - "seines", - "selbst", - "sich", - "sie", - "ihnen", - "sind", - "so", - "solche", - "solchem", - "solchen", - "solcher", - "solches", - "soll", - "sollte", - "sondern", - "sonst", - "über", - "um", - "und", - "uns", - "unse", - "unsem", - "unsen", - "unser", - "unses", - "unter", - "viel", - "vom", - "von", - "vor", - "während", - "war", - "waren", - "warst", - "was", - "weg", - "weil", - "weiter", - "welche", - "welchem", - "welchen", - "welcher", - "welches", - "wenn", - "werde", - "werden", - "wie", - "wieder", - "will", - "wir", - "wird", - "wirst", - "wo", - "wollen", - "wollte", - "würde", - "würden", - "zu", - "zum", - "zur", - "zwar", - "zwischen" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/german-common-nouns.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/german/german-common-nouns.txt deleted file mode 100644 index aced66a52..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/german-common-nouns.txt +++ /dev/null @@ -1,3870 +0,0 @@ -ähren -ältesten -ämter -änderungs -äquatorial -äquivalenz -ärmel -ärzte -abänderungs -abarbeitungs -abbau -abbildungs -abbinde -abblas -abblend -abbrand -abbrems -abbrenn -abbruch -abbuchungs -abdampf -abdeck -abdicht -abdichtungs -abdominal -abdreh -abdruck -abduktions -abduktoren -abdunkelungs -abduzens -abend -abendmahl -abendmahls -abenteuer -abenteurer -abfahrt -abfahrts -abfall -abfang -abfertigungs -abfindungs -abflug -abfluss -abfrage -abführ -abfüll -abfuhr -abgabe -abgaben -abgangs -abgas -abgeordneten -abgeschlossenheits -abgrenzungs -abhänge -abhängigkeits -abhäute -abhebe -abhitze -abhör -abhol -abisolier -abitur -abiturienten -abkant -abklatsch -abkling -abkühlungs -abkürzungs -ablade -abladungs -ablage -ablagerungs -ablass -ablauf -ablege -ablehnungs -ableit -ableitungs -ablenk -ablenkungs -ablese -ablieferungs -ablöse -ablösungs -abluft -abmagerungs -abmelde -abnahme -abnehmer -abnutzungs -abonnement -abonnements -abonnenten -abort -abpack -abrechnungs -abreiss -abreise -abricht -abrieb -abriss -abroll -abrüstungs -abruf -absatz -absaug -abschalt -abschiebe -abschieds -abschirm -abschlags -abschlepp -abschluss -abschmier -abschmink -abschneid -abschneide -abschnitts -abschott -abschottungs -abschreck -abschreckungs -abschreibe -abschreibungs -abschuss -abschwächungs -abseits -absetz -absetzungs -absicherungs -absichts -absolut -absonderungs -absorbier -absorptions -abspann -absperr -abspiel -absprengungs -absprung -abspül -abstammungs -abstand -abstands -abstell -abstiegs -abstimm -abstimmungs -abstinenz -abstossungs -abstrahl -abstraktions -absturz -abszissen -abtast -abteil -abteilungs -abtreibungs -abtrenn -abtretungs -abtropf -abwägungs -abwärts -abwanderungs -abwasch -abwasser -abwehr -abwertungs -abwesenheits -abwickel -abwicklungs -abwrack -abwurf -abzähl -abzahlungs -abzeichen -abzieh -abzugs -abzweig -achilles -achs -achsel -achsen -acht -achter -achtungs -acker -acryl -action -adams -adaptations -adapter -adaptions -addier -additions -adduktions -adel -adels -ader -adhäsions -adler -administrations -admiral -admirals -adoleszenten -adoptions -adoptiv -adress -adressen -adsorptions -advents -affekt -affen -afrika -after -agenten -agentur -agglutinations -aggregations -aggressions -agitations -agrar -ahnen -ahorn -akademie -akademiker -akkommodations -akkord -akkreditierungs -akkreditiv -akku -akkumulator -akquisitions -akrobaten -akt -akten -aktien -aktionärs -aktions -aktiv -aktivierungs -aktivisten -aktivitäts -aktualisierungs -akupunktur -akustik -akzent -akzept -akzeptanz -akzidenz -alarm -alarmierungs -algerien -alibi -alkali -alkohol -allee -allein -allerwelts -allgemein -allianz -allrad -allround -alltags -allwetter -allzweck -alm -almosen -alpen -alpha -alster -alt -altar -alten -alternativ -alters -altertums -alterungs -altöl -alu -aluminium -amalgam -amateur -ameisen -amerika -ammen -ammoniak -ammonium -amnestie -amok -ampel -amphibien -amplituden -amts -anal -analog -analyse -ananas -anbau -andachts -andenken -andromeda -andruck -anerkennungs -anfänger -anfahr -anfahrts -anfangs -anfechtungs -anfeuerungs -anflug -anforderungs -anführungs -anfuhr -angebots -angehörigkeits -angel -angestellten -angler -angora -angriffs -angst -anhänger -anhörungs -animations -ankauf -ankaufs -anker -anklage -ankleide -ankündigungs -ankunfts -anlage -anlagen -anlauf -anlege -anleger -anleihe -anlieger -anmelde -annäherungs -annahme -annoncen -anoden -anordnungs -anpassungs -anrainer -anrechnungs -anrechts -anrede -anregungs -anreicherungs -anreise -anruf -ansatz -ansaug -anschaffungs -anschalt -anschauungs -anschlag -anschlags -anschluss -anschnall -anschraub -ansichts -ansiedlungs -ansprech -anspruchs -anstalts -anstands -ansteck -ansteckungs -anstellungs -ansteuer -ansteuerungs -anstiegs -anteil -anteils -antennen -anti -antifa -antiquariats -antiquitäten -antrags -antriebs -antritts -antwort -anwalts -anwartschafts -anweisungs -anwender -anwendungs -anwesenheits -anzahlungs -anzeige -anzeigen -anziehungs -anzug -aorten -apartment -apfel -apfelsinen -apostel -apotheken -apotheker -appartement -appetit -applikations -aprikosen -april -aquarell -araber -arbeiter -arbeitgeber -arbeitnehmer -arbeits -arbeitslosen -architekten -architektur -archiv -archivierungs -argument -argumentations -aristokraten -arkaden -arktis -arm -armaturen -armee -armen -armuts -arrest -arsch/n -arsen -art -arten -arterien -artikel -artikulations -artillerie -arznei -arzt -asbest -aschen -asien -asphalt -assembler -assistenz -assoziations -ast -asteroiden -asthma -astro -astronauten -asyl -atelier -atem -atemwegs -athleten -athletik -atlantik -atmungs -atom -attentats -audio -aufbau -aufbereitungs -aufbewahrungs -aufenthalts -auferstehungs -auffahrts -auffang -auffassungs -aufforderungs -auffrischungs -aufführungs -aufgabe -aufgaben -aufhebungs -aufheiz -aufklärungs -auflade -auflage -auflagen -aufliege -auflösungs -auflockerungs -aufmarsch -aufmerksamkeits -aufnahme -aufprall -aufputsch -aufrüstungs -aufruf -aufsatz -aufschlag -aufschnitt -aufschüttungs -aufsichts -aufspann -aufstands -aufsteck -aufstell -aufstellungs -aufstiegs -aufstock -auftakt -auftrags -auftriebs -auftritts -aufwärm -aufwärts -aufwach -aufwands -aufwickel -aufzeichnungs -aufzug -augen -august -augustiner -auktions -aussen -aussenbord -ausbau -ausbeutungs -ausbilder -ausbildungs -ausbreitungs -ausbruchs -ausdehnungs -ausdrück -ausdrucks -auseinander -ausfahrt -ausfall -ausflugs -ausfluss -ausführungs -ausfüll -ausfuhr -ausgabe -ausgaben -ausgangs -ausgeh -ausgleichs -ausguss -aushärte -aushilfs -auskunfts -ausländer -auslands -auslass -auslauf -ausleger -auslegungs -auslese -auslieferungs -auslöse -ausnahme -ausnutzungs -ausprägungs -auspuff -ausreise -ausrüstungs -aussage -ausschalt -ausscheidungs -ausschluss -ausschreibungs -ausschuss -aussichts -aussöhnungs -aussonderungs -ausspäh -ausstattungs -aussteige -aussteiger -ausstell -aussteller -ausstellungs -ausstiegs -austausch -austragungs -austritts -ausübungs -ausverkaufs -auswärts -auswahl -auswanderungs -ausweich -ausweis -ausweisungs -auswerte -auswertungs -auszahlungs -auszugs -authentifizierungs -auto -autogramm -automaten -automatik -automatisierungs -automobil -autonomie -autoren -autoritäts -avantgarde -bäcker -bänder -bären -baby -bach -bachelor -back -backen -bade -bagger -bahn -bahnhofs -bajonett -bakterien -balkan -balken -balkon -ball -ballett -ballon -ballungs -balz -bananen -band -banden -banditen -bank -banken -bankrott -bann -banner -bar -baracken -barbaren -barock -barometer -bart -basal -basalt -baseball -basis -basken -basketball -bass -bastel -bataillons -batterie -bau -bauch -bauern -baum -bazillen -beamten -beantragungs -beantwortungs -bearbeitungs -beat -beatmungs -beauty -bebauungs -beben -becher -becken -bedachungs -bedarfs -bedenken -bedeutungs -bedien -bediener -bedienungs -bedingungs -bedrohungs -bedürfnis -beeinflussungs -beerdigungs -befähigungs -befangenheits -befehls -befestigungs -beförderungs -befrachtungs -befragungs -befreiungs -befriedigungs -befruchtungs -befund -begabten -begabungs -begasungs -begattungs -begebungs -begeisterungs -beglaubigungs -begleit -begleiter -begnadigungs -begräbnis -begrenzer -begrenzungs -begriffs -begründungs -begrüssungs -behälter -behältnis -behandlungs -behebungs -behelfs -behilfs -behinderten -behörden -bei -beicht -beifalls -beileids -bein -beispiel -beistands -beitrags -beitritts -bekämpfungs -bekenner -bekenntnis -bekleidungs -belade -belagerungs -belastungs -belebungs -beleg -belegschafts -belegungs -belehrungs -beleidigungs -beleihungs -beleuchtungs -belichtungs -beliebtheits -belüftungs -bemessungs -benediktiner -benelux -benotungs -benutzer -benutzungs -benzin -beobachter -beobachtungs -bequemlichkeits -berater -beratschlagungs -beratungs -berechnungs -berechtigungs -bereichs -bereinigungs -bereitschafts -bereitstellungs -berg -bergmanns -bergungs -bericht -berichtigungs -berichts -bermuda -berührungs -berufs -berufungs -beruhigungs -besatzungs -beschäftigungs -beschaffungs -beschleunigungs -beschluss -beschreibungs -beschwerde -beschwichtigungs -beschwörungs -beseitigungs -besen -besetzungs -besichtigungs -besinnungs -besitz -besoldungs -bespitzelungs -besprechungs -besserungs -bestätigungs -bestands -bestattungs -bestechungs -besteck -bestell -besteuerungs -bestimmungs -bestrahlungs -bestückungs -besucher -besuchs -betätigungs -betäubungs -beteiligungs -beton -betonier -betrachtungs -betrags -betreuungs -betriebs -betrugs -bett -bettel -beuge -beurteilungs -beute -beutel -bevölkerungs -bewährungs -bewässerungs -bewachungs -bewegungs -beweis -bewerber -bewerbungs -bewertungs -bewilligungs -bewirtungs -bewölkungs -bewunderungs -bewusstseins -beziehungs -bezirks -bezugs -bibel -biber -bibliotheks -biedermeier -bienen -bier -bikini -bilanz -bilanzierungs -bild -bilder -bildungs -billard -billig -binär -binde -bindungs -binnen -bio -biologie -biometrie -birken -bischofs -bistums -bläser -blätter -blanko -blas -blasen -blatt -blau -blaubeer -blech -blei -bleibe -bleich -blick -blind -blinden -blink -blitz -block -blockade -blüten -blumen -blut -böller -börsen -böschungs -bob -bock -boden -bogen -bohnen -bohr -bomben -bomber -bon -bond -bonitäts -bonus -boom -boot -boots -bord -bordell -botanik -boten -botschafter -botschafts -boulevard -box -boykott -branchen -brand -brandungs -branntwein -brat -bratschen -brau -brauerei -braun -brause -braut -brech -brechungs -breit -breiten -brems -brenn -brett -bretter -brief -brigade -brikett -brillant -brillen -brötchen -broker -brombeer -bronchial -bronze -brot -brücken -bruch -bruder -brumm -brunnen -brust -brut -brutto -bücher -büchsen -bügel -bühnen -bündel -bündelungs -bündnis -bürger -bürgschafts -büro -bürsten -buben -buch -buchen -buchsen -buchstaben -buchungs -budget -bullen -bummel -bundes -bundestags -bungalow -bunker -bunt -burg -bus -buss -busch -busen -busgeld -butter -calcium -camping -cello -cellophan -charakter -charter -chat/n -chauffeur -chef -chemie -chemikalien -chiffre -chip -chor -christ -christen -chromosomen -cliquen -club -code -comic/n -computer -container -couch -cowboy -curry -dämm -dämmer -dämonen -dämpfungs -dach -damen -damm -dampf -dampfer -dank -dankes -darbietungs -darlehens -darlehns -darm -darstellungs -daseins -datei -daten -datums -dauer -daumen -daunen -deck -deckel -decken -deckungs -decodier -deeskalations -defensiv -definitions -defizit -deflations -dehnungs -deich -deklarations -deklinations -dekodier -dekorations -delegations -delegierten -delta -demo -demokratie -demokratisierungs -demonstrations -demontage -denitrifikations -denk -denkmal -dental -depositen -depot -depressions -design -designer -desinfektions -detail -deutsch -deutschland -devisen -dezember -dezimal -diät -diagnose -diagramm -dialog -dialyse -diamant -dicht -dichter -dichtungs -dick -diebes -diebstahl -dielen -dienst -dienstag -dienstags -diesel -diffamierungs -differential -differenz -differenzial -differenzierungs -diffusions -digital -diktier -diözesan -dioden -dioxid -diphtherie -diplom -diplomaten -direkt -direktions -dirigenten -disketten -diskont -diskussions -display -dispositions -distanz -distributions -disziplinar -disziplinierungs -dividenden -divisions -doktor -dokument -dokumentar -dokumentations -dokumenten -dolch -dollar -dolmetscher -dom -domino -donau -donner -donnerstag -donnerstags -doping -doppel -dorf -dornen -dosen -dosier -drachen -draht -dreck -drecks -dreh -drei -dreiecks -dreier -dressur -drillings -dringlichkeits -dritt -drogen -droh -drüsen -druck -drucker -dschungel -dünge -dünn -düsen -dudel -duft -dunkel -dunst -durchfluss -durchführungs -durchgangs -durchgriffs -durchhalte -durchlauf -durchmarsch -durchreise -durchschlag -durchschnitts -durchsetzungs -durchsuchungs -durchwahl -durst -dusch -dynamik -dynamit -echo -echtzeit -eck -edel -editier -effekten -effektiv -effizienz -ehe -ehegatten -ehren -eich -eichel -eichen -eidechsen -eier -eifersuchts -eigen -eigenschafts -eigentums -eignungs -eil -ein -einarbeitungs -einbau -einbruch -einbruchs -eindeckungs -eindrucks -einfahrt -einfall -einfalls -einfang -einfluss -einfühlungs -einführungs -einfüll -einfuhr -eingabe -eingangs -eingeweide -eingriffs -einheits -einhorn -einigungs -einkauf -einkaufs -einkommens -einkommensteuer -einlauf -einlege -einlieferungs -einmach -einmann -einnahme -einordnungs -einreise -einrichtungs -einsamkeits -einsatz -einschalt -einschränkungs -einschreibe -einschüchterungs -einschub -einschulungs -einschuss -einsende -einsortier -einsparungs -einspritz -einspruchs -einstands -einsteiger -einstell -einstellungs -einstich -einstiegs -einstufungs -einsturz -eintausch -einteilungs -eintopf -eintragungs -eintritts -einverständnis -einwärts -einwanderungs -einweg -einweihungs -einweisungs -einwilligungs -einwirkungs -einwohner -einzahlungs -einzel -einziehungs -einzugs -eis -eisen -eiter -eiweiss -ejakulations -ekel -elastik -elastizitäts -elch -elefanten -elektrizitäts -elektro -elektronen/n -elektronik -element -elementar -elends -elevations -elf -elfen -elfmeter -elite -ellbogen -ellen -eltern -emanzipations -embryonal -embryonen -emigranten -emissions -empfänger -empfängnis -empfangs -empfehlungs -empfindungs -emulations -emulsions -end -endlos -energie -engels -england -englisch -engpass -enkel -enquete -ensemble -entartungs -entbindungs -entdeckungs -enteignungs -enteisungs -enten -entertainment -entfaltungs -entfernungs -entflammungs -entflockungs -entführungs -entgelt -enthaarungs -enthauptungs -enthebungs -entkleidungs -entlade -entlassungs -entlastungs -entlaubungs -entlausungs -entlohnungs -entlüftungs -entminungs -entnahme -entnazifizierungs -entprellungs -entrauchungs -entriegelungs -entsalzungs -entschädigungs -entscheidungs -entschluss -entschuldigungs -entsorgungs -entspannungs -entstehungs -entwässerungs -entwickler -entwicklungs -entwurfs -entziehungs -erb -erd -erdbeer -erdungs -ereignis -erektions -erfahrungs -erfassungs -erfinder -erfindungs -erfolgs -erfrischungs -ergänzungs -ergebnis -erhaltungs -erhebungs -erholungs -erinnerungs -erkältungs -erkenntnis -erkennungs -erklärungs -erkundungs -ermächtigungs -ermessens -ermittlungs -ermüdungs -ernährungs -erneuerungs -ernte -eröffnungs -eroberungs -erpressungs -erprobungs -erregungs -errichtungs -ersatz -erscheinungs -erschiessungs -erschöpfungs -ersetzungs -erst -erstellungs -erstickungs -ertrags -erwachsenen -erwartungs -erweiterungs -erwerbs -erz -erzeuger -erzeugungs -erziehungs -eskalations -ess -essens -essig -etagen -etappen -etat -ethik -etiketten -etüden/n -eulen -euro -europa -evaluierungs -evolutions -examens -exekutiv -exil -existenz -exklusiv -expansions -expeditions -experimental -experimentier -experten -explosions -explosiv -export -extra -extrem -fächer -fähr -fälligkeits -fälschung -fälschungs -fäulnis -fabrik -fabrikations -facetten -fach -fackel -fahndungs -fahnen -fahr -fahrer -fahrt -fahrten -fahrzeug -fakten -fall -falsch -falt -falten -familien -fanfaren -fang -farb -faschings -faser -fassetten -fassungs -faust -februar -fecht -feder -feger -fehl -fehler -feier -feiertags -feigen -fein -feind -feld -fell -fels -felsen -fenster -ferien -fern -fernseh -fertig -fertigungs -fest -festival -fett -feuchtigkeits -feuer -fichten -fick/n -fieber -film -filter -finanz -finanzierungs -findungs -finger -firmen -firmware -fisch -fischer -fischerei -fitness -fixier -fixpunkt -flächen -flach -flammen -flaschen -flecken -fleisch -fliegen -flieger -fliess -fliesen -flöten -flocken -flotten -flüchtlings -flügel -flüssig -flüssigkeits -flucht -flug -flugzeug -flur -fluss -flut -förder -förderungs -folge -folien -folter -forderungs -foren -form -formaldehyd -formatierungs -formel -formular -formulierungs -forscher -forschungs -forst -fortbildungs -fortpflanzungs -fortschritts -fotzen -fräs -fracht -frage -fraktions -frauen -frei -freigabe -freiheits -freitag -freitags -freiwilligen -freizeit -fremd -fremden -fremdsprachen -frequenz -fress -freuden -freundschafts -friedens -frisch/n -friseur -front -frontal -frosch -frost -früchte -früh -frühlings -frühstücks -frucht -fruchtbarkeits -führer -führungs -füll -fünf -fürsorge -fürsten -fuchs -fugen -fundamental -funk -funktions -furnier -fuss -fusions -futter -gänse -gäste -gabel -gala -galerie -galgen -gallen -galopp -gang -gangster -ganzkörper -ganztags -ganzzahl -garagen -garantie -garderoben -gardinen -garten -gas -gast -gattungs -gaumen -gebär -gebäude -geber -gebets -gebiets -gebirgs -gebläse -gebrauchs -gebraucht -gebühren -geburten -geburts -geburtstags -gedächtnis -gedanken -gedenk -gedulds -gefährdungs -gefängnis -gefäss -gefahren -gefahrenstoff -gefahrstoff -geflügel -gefrier -gefühls -gegen -gegenwarts -gehäuse -gehalts -geheim -geheimnis -gehirn -gehör -geigen -geister -geistes -gelände -geld -gelegenheits -gelehrten -geleit -gelenk -geltungs -gemälde -gemeinde -gemeinschafts -gemüse -gemüts -gen -genehmigungs -general -generations -genesungs -genital -genossenschafts -genuss -geometrie -gepäck -geräte -geräusch -gerechtigkeits -gerichts -gerinnungs -geröll -gersten -geruchs -gesäss -gesamt -gesang -gesangs -geschäfts -geschenk -geschichts -geschirr -geschlechter -geschlechts -geschmacks -geschoss -geschwindigkeits -geschwulst -gesellschafts -gesetzes -gesetzgebungs -gesichts -gesinnungs -gespenster -gesprächs -gestaltungs -gesteins -gesundheits -getränke -getreide -getriebe -gewähr -gewalt -gewebe -gewehr -gewerbe -gewerkschafts -gewichts -gewinde -gewinn -gewinnungs -gewissens -gewitter -gewohnheits -gewürz -giess -giesserei -gift -gipfel -gips -giro -gitarren -gitter -gläubiger -glanz -glas -glaubens -glaubwürdigkeits -gleich -gleichheits -gleis -gleit -gletscher -gliederungs -glimm -glitzer -global -globalisierungs -glocken -glücks -glückwunsch -glüh -götter -götzen -gold -golf -gottes -grab -graben -grafik -grammatik -granat -gras -gravitations -greif -grenz -griff -grill -grippe -grössen -grob -gross -grün -gründer -gründungs -gruben -grund -grundstücks -gruppen -gruss -grusel -gültigkeits -gürtel -güte -güter -guck -guerilla -gummi -gurken -gurt -guss -guts -gutschein -gymnasiasten -gymnastik -händler -hänge -härte -häufigkeits -häuser -haar -hack -hafen -hafer -haft -haftungs -hagel -haken -halb -hallen -halogen -hals -haltbarkeits -halte -halterungs -haltungs -hammel -hammer -hand -handels -handlungs -handy -hanf -hang -hardware -harmonie -harn -hart -hasel -hasen -hass -haupt -haus -haushalts -haut -hebel -heck -hecken -heeres -heft -heil -heilungs -heim -heimat -heirats -heiss -heiz -heizungs -helden -helium -helligkeits -hemd -herbergs -herbst -herkunfts -herren -herrschafts -herrscher -hersteller -herstellungs -herz -hetz -heuschrecken -hexen -hierarchie -hilfe -hilfs -himbeer -himmel -himmels -hindernis -hinter -hintern -hinweis -hirn -hirsch -hirten -hitze -höchst -höhen -höhlen -höllen -hör -hörer -hobby -hobel -hoch -hochzeits -hockey -hof -hoffnungs -hoheits -hohl -holz -honig -honorar -horizont -hormon -horror -hosen -hotel -hüft -hügel -hühner -hülsen -hürden -hütchen -hütten -hub -hubschrauber -huf -human -hunde -hunger -husten -hut -hybrid -hydraulik -hypotheken -ideal -ideen -identifikations -identitäts -ideologie -image -imbiss -immatrikulations -immissions -immobilien -immun -impf -implementations -implementierungs -import -improvisations -impuls -index -indikations -individual -indizierungs -induktions -industrie -infektions -inflations -info -informatik -informations -infrarot -ingenieur -ingenieurs -inhaber -inhalts -initialisierungs -inlands -innen -innovations -insekten -insel -insider -insolvenz -installations -instituts -instrumental -instrumenten -insulin -integrations -integritäts -intelligenz -interessen -interims -internats -internet -internierungs -interoperabilitäts -interpretations -interventions -invasions -inventur -investitions -investment -ionen -ionisierungs -islam -isolier -jäger -jacken -jagd -jahres -jahrhundert -jammer -januar -japan -jazz -job -joghurt -journal -jubel -jubiläums -juden -jugend -juli -jung -juni -juristen -justiz -jute -juwelen -juwelier -käfig -kälte -käse -käufer -kabel -kabinen -kabinetts -kaffee -kaiser -kalbs -kalender -kalk -kalkulations -kalorien -kalt -kamel -kamera -kamin -kammer -kampf -kanal -kanalisations -kandidaten -kaninchen -kanonen -kanten -kantinen -kanzlei -kanzler -kapazitäts -kapitäns -kapital -karamell -karawanen -karibik -karnevals -karosserie -karriere -kartei -kartell -karten -kartoffel -karton -kasernen -kassen -kassetten -kastanien -kasten -kastrations -katastrophen -katzen -kauf -kaufmanns -kausal -kautschuk -kavallerie -kegel -kehlkopf -kehr -keil -keim -kelch -keller -kenn -kenntnis -keramik -kerker -kern -kerzen -kessel -ketten -ketzer -keuschheits -kiefer -kiel -kiesel -kilometer -kinder -kindes -kindheits -kinn -kino -kipp -kirch -kirchen -kirsch -kissen -kisten -klär -klage -klammer -klang -klapp -klappen -klarinetten -klartext -klassen -klatsch -klausur -klavier -kleb -klebe -kleider -kleidungs -klein -kleinst -klemm -klemmen -klempner -kletter -klima -klingel -klinik -klinker -kloster -klub -knaben -knack -knall -knebel -kneipen -knet -knie -knochen -knopf -knoten -knüppel -königs -körper -koalitions -koch -kodier -koffer -kohle -kohlen -kolben -kollateral -kollektiv -kollisions -kolonial -kombinations -komfort -kommando -kommissions -kommunal -kommunikations -kompakt -kompanie -kompass -kompatibilitäts -kompensations -kompetenz -komplett -komplexitäts -komposita -kompositions -kompressions -kompromiss -kondens -konditions -kondom -konfektions -konferenz -konfessions -konfigurations -konfirmations -konflikt -konformitäts -konfrontations -kongress -konjugations -konjunktur -konkurrenz -konkurs -konserven -konservierungs -konsolidierungs -konsortial -konsortiums -konstruktions -konsular -konsulats -konsultations -konsum -kontakt -konten -kontext -kontinental -kontingent -konto -kontrast -kontroll -konversations -konzentrations -konzept -konzern -konzert -konzessions -kooperations -koordinaten -koordinations -koordinierungs -kopf -kopier -koppel -kopplungs -korallen -korb -kord -kork -korn -korrektur -korrelations -korrespondenz -korruptions -korsett -kosmetik -kosten -kostüm -kräfte -kräuter -krabben -kraft -kran -kranken -krankheits -kranz -krawatten -krebs -kredit -kreide -kreis -kreuz -kriegs -kriminal -kriminalitäts -krisen -kristall -kritik -kröten -kron -küchen -kühl -kündigungs -künstler -kürzungs -küsten -kuchen -kugel -kuh -kultur -kultus -kunde -kunden -kunst -kupfer -kupplungs -kur -kurier -kurs -kurven -kurz -kuschel -länder -längen -längs -lärm -labor -lach -lack -lade -laden -ladungs -lagen -lager -laminat -lampen -land -lande -landes -landschafts -landtags -landungs -lang -langsam -laptop -laser -last -lasten -latenz -laternen -latten -laub -lauf -lausch -lawinen -leasing -lebens -leber -leck -leder -leer -legitimations -lehm -lehr -lehrer -lehrgangs -leichen -leicht -leih -leisten -leistungs -leit -leiter -leitungs -lenden -lenk -lern -lese -leucht -licht -liebes -lieblings -liefer -liege -linien -links -linsen -lippen -liquidations -liquiditäts -listen -literatur -lizenz -löffel -löss/n -lösch -lösungs -löt -löwen -lobby -loch -lock -locken -logik -lohn -lokal -lorbeer -lotterie -lotto -lücken -lüftungs -lügen -luft -lumineszenz -lungen -lust -luxus -lymph -mächte -mädchen -mängel -männer -märchen -märz -macht -magen -magister -magnet -mahn -mai -makro -mammut -mandel -mangel -manipulations -mannschafts -mantel -manuskript -mappen -marathon -marder -margarine -marine -marken -markt -marmor -marsch -mass -maschinen -masken -massage -massen -massiv -mast -material -mathematik -matrikel -matrix -matrosen -mauer -maul -maus -maut -maximal -medaillen -medien -medikamenten -medizin -meeres -mehl -mehr -mehrheits -meinungs -meister -meisterschaft -meisterschafts -melanom -melde -mengen -mensa -menschen -menschheits -menstruations -menü -merk -mess -messe -messer -messing -metall -methadon -methoden -miet -mieter -migrations -mikro -milch -militär -milliarden -millionärs -millionen -minderheiten -minderheits -mindest -minen -mineral -mini -miniatur -minimal -minister -ministerial -minuten -misch -mischungs -missbrauchs -mit -mitarbeiter -mitglieder -mitglieds -mittags -mitteilungs -mittel -mitternachts -mittwoch -mittwochs -möbel -mobil -mode -modell -modernisierungs -modul -modularisierungs -molkerei -monats -mond -monitor -monopol -monster -montag -montage -montags -montan -moor -moränen -moral -mord -morgen -morse -motor -motoren -motten -mücken -müll -münz -mütze -mull/n -multimedia -mund -munitions -murmel -muschel -museums -musik -muskel -muster -mutter -näh -näherungs -nähr -nachbar -nachfolge -nachhilfe -nachkriegs -nachlauf -nachmittags -nachnahme -nachrichten -nachschlage -nachschub -nacht -nachweis -nachwuchs -nachzahlungs -nadel -nagel -nahrungs -namens -nano -narren -nasen -national -natrium -natur -navigations -nazi -nebel -neben -negativ -neger/n -neigungs -nelken -nenn -neo/n -nerven -netto -netz -neu -neujahrs -neun -neutralitäts -neutronen -nibelungen -nicht -nieder -niederschlags -nieren -nischen -nobel -nomaden -nominal -nord -normal -not -notar -notaus -noten -notstands -november -nuklear -null -nummern -nuss -nutz -nutzer -nutzungs -öffnungs -öko -öl -obduktions -ober -objekt -obst -ofen -offensiv -offiziers -ohr -ohren -oktober -olympia -omnibus -online -operations -operetten -opern -opfer -oppositions -optimierungs -options -oral -orangen -orchester -ordner -ordnungs -organ -organisations -orgel -orient -orientierungs -original -orts -ortungs -ost -oster -oxydations -ozean -ozon -pacht -pack -paket -palästinenser -palast -panik -pannen -panorama -panzer -papier -papp -paprika -papst -para/n -parade -paradies -parallel -parameter -park -parkett -parlaments -partei -parteien/n -parteitags -partisanen -partner -pass -passagier -passier -patent -patienten -patrouillen -pauschal -pausen -pegel -peil -pelz -pendel -penis -pensions -perioden -peripherie -perlen -persönlichkeits -personal -personen -pfad -pfand -pfarr -pfeffer -pfeil -pferde -pfingst -pflanzen -pflege -pflicht -pharma -phasen -philologie -photonen -physik -pickel -piezo -pilger -piloten -pilz -piraten -piraterie -pistolen -pixel -plättchen -plagiats -planeten -planungs -plastik -platin -platinen -platten -platz -platzierungs -pleite -pleiten -plexiglas -pokal -pol -polar -polarisations -polier -polit -politik -polizei -polster -poren -porno/n -porzellan -posaunen -positions -positiv -post -potenz -präsidenten -präsidentschafts -präventiv -präzisions -pracht -praktikanten -praktikums -praxis -preis -press -presse -prestige -priester -privat -privatisierungs -probe -proben -problem -produkt -produktions -produktiv -produktivitäts -professoren -profi -profil -prognose -programm -programmier -projekt -projektions -propaganda -proportional -prostitutions -protein -protest -protokoll -provinz -prozess -prozessor -prüf -prüfungs -prügel -pseudo -publikums -puder -puffer -pullover -pump -pumpen -punkt -punkte -pupillen -puppen -putz -quadrat -qualitäts -quanten -quartals -quell -quellen -quer -quoten -räumungs -rabatt -rad -radar -radial -radio -radium -rahmen -raketen -rand -rang -rasen -rasier -rassen -rast -raster -rationalisierungs -rats -ratten -raub -rauch -raucher -raum -rausch -reaktions -reaktor -real -realitäts -rebellen -rechen -recherche -rechner -rechnungs -rechte -rechteck -rechts -rechtschreib -recycling -rede -referenz -reflex -reflexions -reform -reformations -regel -regelungs -regen -regierungs -regional -register -registrier -regulierungs -rehabilitations -reibungs -reichs -reichstags -reifen -reihen -reinigungs -reinlichkeits -reise -reit -reiter -reiz -reklame -rekord -rekrutierungs -relais -relativ -religions -renn -renten -reparatur -reporter -repräsentations -reptilien -reserve -resonanz -ressourcen -rest -restrukturierungs -rettungs -revolutions -rezessions -rhythmus -richt -richter -richtungs -riesen -ring -ringel -rippen -risiko -riss -ritter -röhren -röntgen -roboter -rock -roh -rohr -roll -rollen -roman -rosen -rost -rot -rotations -routine -rück -rücken -rüstungs -ruder -ruf -ruhe -rumpf -rund -säge -sättigungs -säuglings -säulen -sabotage -sach -saft -saison -salat -salz -samen -sammel -sammler -samstag -samstags -sand -sanierungs -sanitär -sanitäts -sarg -satelliten -sattel -satz -sauberkeits -sauer -saug -schädel -schädlings -schätz -schach -schad -schaden -schadens -schaf -schaffens -schall -schalt -schatten -schatz -schau -schaufel -schaukel -schaum -scheck -scheiben -scheidungs -schein -schenkel -schicht -schichten -schicksals -schiebe -schieds -schiefer -schienen -schiess -schiffer -schifffahrts -schiffs -schild -schinken -schirm -schlacht -schlaf -schlag -schlager -schlamm -schlangen -schlauch -schleif -schleifen -schleim -schlepp -schlepper -schleuder -schlichtungs -schliess -schlitten -schlitz -schloss -schlosser -schlüssel -schluck -schlupf -schluss -schmal -schmelz -schmerz -schmerzens -schmiede -schmier -schmuck -schmuggel -schmuggler -schmutz -schnarch -schnee -schneid -schneide -schnell -schnitt -schnür -schön -schönheits -schöpfer -schöpfungs -schock -schokoladen -schon -schornstein -schotter -schräg -schrank -schranken -schraub -schrauben -schreck -schreckens -schreib -schrift -schritt -schrott -schüler -schürzen -schützen -schub -schuh -schul -schuld -schulden -schulter -schulungs -schuppen -schuss -schutt -schutz -schwäche -schwangerschafts -schwanz -schwarz -schwebe -schwefel -schweige -schweine -schweiss -schwellen -schwemmungs -schwenk -schwer -schwert -schwester -schwestern -schwierigkeits -schwimm -schwindel -schwing -schwingungs -schwitz -schwung -sechs -see -seelen -segel -segment -seh -sehnen -seiden -seifen -seil -seiten -sekretariats -sekt -sekten -sektor -sekundär -sekunden -selbst -semmel -senats -sende -senf -senioren -senk -sensations -sensibilitäts -sensor -september -serien -server -service -sesam -sessel -seuchen -sexual -sichel -sicherheits -sicherungs -sicht -sieben -siedler -siedlungs -sieges -signal -silber -silikon -silvester -simulations -sing -sinus -sippen -sitten -sitz -sitzungs -skandal -ski -sklaven -smog -sofort -software -soja -soldaten -solidaritäts -solo -sommer -sonder -sonnen -sonntag -sonntags -sorgfalts -sossen -souveränitäts -sowjet -sozial -sozialisierungs -späh -spät -spachtel -spalt -spalten -spaltungs -spann -spannungs -spar -sparer -spass -spazier -speichel -speicher -speise -spekulations -spenden -spender -sperr -spesen -spezial -spiegel -spiel -spinnen -spionage -spiral -spitz -spitzen -splitter -sport -spott -sprach -sprech -spreiz -spreng -spring -spritz -sprüh -sprung -spül -spür -spur -spuren -städte -stätten -staaten -staats -stabilisierungs -stabs -stachel -stadion -stadt -stahl -stamm -stammes -stand -standard -standardisierungs -standes -standort -stangen -stapel -start -stationierungs -status -staub -staubsauger -stech -steck -steig -steiger -steil -stein -stell -stellen -stellungs -stemm -stempel -sterbe -stern -steuer -steuerungs -stich -stickstoff -stiefel -stift -stimm -stimmen -stimulations -stirn -stör -störungs -stock -stoff -stolper -stoss -straf -strahlen -strahlungs -strassen -strategie -streb -streck -strecken -streich -streif -streifen -streik -streit -streu -streusel -strich -strick -stroh -strom -struktur -strumpf -stück -stütz -studenten -studien -studierenden -stufen -stuhl -stunden -sturm -sturz -süd -sünden -süss -süssigkeiten -sub/n -subjekt/n -subventions -such -sucht -sumpf -super -suppen -symbol -sympathie -symphonie -synchron -synchronisations -synchronisierungs -synonym -system -szene -tätigkeits -täuschungs -tabak -tabellen -tabu -tabulator -tafel -tages -tagungs -takt -tank -tannen -tanz -tapeten -tarif -tarn -taschen -tastatur -tasten -tat -tatsachen -tauch -taucher -tauf -tausch -taxi -technik -technologie -tee -teil -teile -teilnehmer -teilungs -tele -telefon -teller -temperatur -tempo -tennis -teppich -termin -terrassen -territorial -terror -terrorismus -terroristen -test -tetanus -teufels -text -textil -theater -themen -theologie -therapie -thermo -thron -tief -tier -tinten -tipp -tisch -titan -titel -töpfer -tochter -todes -toiletten -toleranz -tomaten -ton -top -tor -torf -total -toten -touristen -touristik -träger -tränen -trafo -trag -trage -trainer -trainings -trampel -tranchier -transaktions -transfer -transfusions -transistor -transit -transport -trassen -trauben -trauer -traum -treib -trend -trenn -trennungs -treppen -tret -treue -treuehand -treuhand -trick -trieb -trink -tritt -trocken -trommel -trompeten -tropen -trümmer -truppen -tür -tuberkulose -tuch -tugend -tulpen -tunnel -turbinen -turbo -turm -turn -turnier -tusch -typen -über -überbrückungs -überdruck -überfall -übergabe -übergangs -überhol -überlagerungs -überlassungs -überlebens -übernachtungs -übernahme -überraschungs -überschlags -überschuss -übersetzer -übersetzungs -übersichts -übertragungs -überwachungs -übungs -ufer -uhr -uhrgross -uhrkunden -ultra -umbau -umbruch -umbuchungs -umdenk -umformungs -umfrage -umgangs -umgebungs -umgehungs -umkehr -umkleide -umlauf -umrechnungs -umsatz -umschalt -umschlag -umsetzungs -umspann -umsteige -umstellungs -umtausch -umwandlungs -umwelt -umzugs -unabhängigkeits -unbedenklichkeits -unfall -unglücks -unions -universal -universitäts -unkosten -unrechts -unter -unterhalts -unterlassungs -unternehmens -unternehmer -unternehmungs -unterrichts -unterstützer -unterstützungs -untersuchungs -uran -urheber -urkunden -urlauber -urlaubs -ursprungs -urteils -vakuum -variablen -varianz -variations -varietee -variet� -vater -vaterschafts -vatikan -vegetations -veilchen -vektor -venen -ventil -veränderungs -veräusserungs -veranstaltungs -verantwortungs -verarbeitungs -verb -verbands -verbindungs -verbots -verbraucher -verbrauchs -verbrechens -verbrecher -verbreitungs -verbrennungs -verbund -verdachts -verdauungs -verdienst -vereins -vererbungs -verfahrens -verfall -verfalls -verfassungs -verfolgungs -verfügungs -verführungs -vergabe -vergeltungs -vergleichs -vergnügungs -vergrösserungs -vergütungs -verhaltens -verhandlungs -verhütungs -verkabelungs -verkaufs -verkehrs -verlängerungs -verlagerungs -verlags -verletzungs -verlobungs -verlust -vermarktungs -vermehrungs -vermessungs -vermietungs -vermittlungs -vermögens -vernehmlassungs -veröffentlichungs -verordnungs -verpackungs -verrechnungs -verrottungs -versäumnis -versammlungs -versand -verschleppungs -verschlüsselungs -verschluss -verschreibungs -versicherungs -versions -versorgungs -verständigungs -verstärker -verstärkungs -verstandes -versteigerungs -verstell -versuchs -vertauschungs -verteidigungs -verteilungs -verträglichkeits -vertrags -vertrauens -vertreter -vertretungs -vertriebs -vervielfältigungs -verwaltungs -verwandlungs -verwandtschafts -verwendungs -verwertungs -verwirklichungs -verzeichnis -verzierungs -verzugs -vexier -vibrations -video -vieh -viel -vier -viertel -villen -violin -viren -virtualisierungs -virus -vitamin -vize -völker -vogel -vokal -volks -voll -vollstreckungs -vollzugs -volontariats -volumen -vor -vorab -vorbereitungs -vorder -vorführ -vorgänger -vorgangs -vorjahres -vorkriegs -vorschub -vorsorge -vorstands -vorstellungs -vortags -vortrags -vortriebs -vorverkaufs -vorzugs -vulkan -wähler -währungs -wärm -wärme -wäsche -wach -wacholder -wachs -wachstums -waden -waffen -wagen -wahl -wahrheits -wahrnehmungs -wahrscheinlichkeits -waisen -wald -walz -walzen -wand -wander -wannen -waren -warm -warn -warte -wartungs -wasch -wasser -watte -web -wechsel -weg -wehr -weiber -weich -weide -weiden -weih -weihnachts -wein -weiss -weisungs -weiter -weizen -well/n -wellen -welt -wendel -werbe -werk -werks -werkstatt -werkzeug -wert -werte -wesens -wespen -west -wett -wettbewerbs -wetter -wetz -wickel -widerspruchs -widerstands -widmungs -wieder -wiedergabe -wiederhaken -wiederhol -wiederholungs -wiederruf -wiegen -wild -willens -wind -windel -winden -windows -winkel -winter -wirbel -wirkungs -wirtschafts -wissens -wissenschaftler -wissenschafts -witterungs -witwen -wörter -wochen -wohl -wohlfahrts -wohltätigkeits -wohn -wohnungs -wolfs -wolken -woll -wonne -wort -wühl -würfel -würge -wüsten -wucher -wund -wunder -wunsch -wurf -wurm -wurst -wurzel -wut -zähl -zähler -zahl -zahlen -zahlungs -zahn -zapf -zauber -zaun -zehn -zeichen -zeichnungs -zeige -zeilen -zeit -zeitungs -zell -zellen -zelt -zement -zensur -zentral -zentrifugal -zentrums -zerfalls -zermürbungs -zersetzungs -zerstörungs -zettel -zeugen -zeugnis -zeugungs -zickzack -ziegel -ziegen -ziel -zier -ziffern -zigaretten -zigarren -zigeuner -zimmer -zimt -zink -zinn -zins -zirkus -zitronen -zivil -zoll -zonen -zoo -zünd -zubereitungs -zubringer -zucht -zucker -zufalls -zug -zugangs -zugriffs -zuhörer -zukunfts -zulassungs -zulauf -zuleitungs -zuliefer -zungen -zuordnungs -zupf -zusammen -zusatz -zuschauer -zuschlags -zustands -zustell -zustellungs -zutritts -zuwachs -zuwanderungs -zuweisungs -zwangs -zweck -zwei -zweier -zweig -zweit -zwerg -zwiebel -zwillings -zwischen -zwölf -zylinder \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/german/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/german/schema.xml deleted file mode 100644 index 4b6b3ac04..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/schema.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/german/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/german/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json deleted file mode 100644 index bf64a7792..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ο", - "η", - "το", - "οι", - "τα", - "του", - "τησ", - "των", - "τον", - "την", - "και", - "κι", - "κ", - "ειμαι", - "εισαι", - "ειναι", - "ειμαστε", - "ειστε", - "στο", - "στον", - "στη", - "στην", - "μα", - "αλλα", - "απο", - "για", - "προσ", - "με", - "σε", - "ωσ", - "παρα", - "αντι", - "κατα", - "μετα", - "θα", - "να", - "δε", - "δεν", - "μη", - "μην", - "επι", - "ενω", - "εαν", - "αν", - "τοτε", - "που", - "πωσ", - "ποιοσ", - "ποια", - "ποιο", - "ποιοι", - "ποιεσ", - "ποιων", - "ποιουσ", - "αυτοσ", - "αυτη", - "αυτο", - "αυτοι", - "αυτων", - "αυτουσ", - "αυτεσ", - "αυτα", - "εκεινοσ", - "εκεινη", - "εκεινο", - "εκεινοι", - "εκεινεσ", - "εκεινα", - "εκεινων", - "εκεινουσ", - "οπωσ", - "ομωσ", - "ισωσ", - "οσο", - "οτι" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/schema.xml deleted file mode 100644 index 96f835579..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/greek/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json deleted file mode 100644 index 070fa4308..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "अंदर", - "अत", - "अपना", - "अपनी", - "अपने", - "अभी", - "आदि", - "आप", - "इत्यादि", - "इन", - "इनका", - "इन्हीं", - "इन्हें", - "इन्हों", - "इस", - "इसका", - "इसकी", - "इसके", - "इसमें", - "इसी", - "इसे", - "उन", - "उनका", - "उनकी", - "उनके", - "उनको", - "उन्हीं", - "उन्हें", - "उन्हों", - "उस", - "उसके", - "उसी", - "उसे", - "एक", - "एवं", - "एस", - "ऐसे", - "और", - "कई", - "कर", - "करता", - "करते", - "करना", - "करने", - "करें", - "कहते", - "कहा", - "का", - "काफ़ी", - "कि", - "कितना", - "किन्हें", - "किन्हों", - "किया", - "किर", - "किस", - "किसी", - "किसे", - "की", - "कुछ", - "कुल", - "के", - "को", - "कोई", - "कौन", - "कौनसा", - "गया", - "घर", - "जब", - "जहाँ", - "जा", - "जितना", - "जिन", - "जिन्हें", - "जिन्हों", - "जिस", - "जिसे", - "जीधर", - "जैसा", - "जैसे", - "जो", - "तक", - "तब", - "तरह", - "तिन", - "तिन्हें", - "तिन्हों", - "तिस", - "तिसे", - "तो", - "था", - "थी", - "थे", - "दबारा", - "दिया", - "दुसरा", - "दूसरे", - "दो", - "द्वारा", - "न", - "नहीं", - "ना", - "निहायत", - "नीचे", - "ने", - "पर", - "पर", - "पहले", - "पूरा", - "पे", - "फिर", - "बनी", - "बही", - "बहुत", - "बाद", - "बाला", - "बिलकुल", - "भी", - "भीतर", - "मगर", - "मानो", - "मे", - "में", - "यदि", - "यह", - "यहाँ", - "यही", - "या", - "यिह", - "ये", - "रखें", - "रहा", - "रहे", - "ऱ्वासा", - "लिए", - "लिये", - "लेकिन", - "व", - "वर्ग", - "वह", - "वह", - "वहाँ", - "वहीं", - "वाले", - "वुह", - "वे", - "वग़ैरह", - "संग", - "सकता", - "सकते", - "सबसे", - "सभी", - "साथ", - "साबुत", - "साभ", - "सारा", - "से", - "सो", - "ही", - "हुआ", - "हुई", - "हुए", - "है", - "हैं", - "हो", - "होता", - "होती", - "होते", - "होना", - "होने", - "अपनि", - "जेसे", - "होति", - "सभि", - "तिंहों", - "इंहों", - "दवारा", - "इसि", - "किंहें", - "थि", - "उंहों", - "ओर", - "जिंहें", - "वहिं", - "अभि", - "बनि", - "हि", - "उंहिं", - "उंहें", - "हें", - "वगेरह", - "एसे", - "रवासा", - "कोन", - "निचे", - "काफि", - "उसि", - "पुरा", - "भितर", - "हे", - "बहि", - "वहां", - "कोइ", - "यहां", - "जिंहों", - "तिंहें", - "किसि", - "कइ", - "यहि", - "इंहिं", - "जिधर", - "इंहें", - "अदि", - "इतयादि", - "हुइ", - "कोनसा", - "इसकि", - "दुसरे", - "जहां", - "अप", - "किंहों", - "उनकि", - "भि", - "वरग", - "हुअ", - "जेसा", - "नहिं" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/schema.xml deleted file mode 100644 index eaf96e226..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/schema.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hindi/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json deleted file mode 100644 index 05e253146..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "ahogy", - "ahol", - "aki", - "akik", - "akkor", - "alatt", - "által", - "általában", - "amely", - "amelyek", - "amelyekben", - "amelyeket", - "amelyet", - "amelynek", - "ami", - "amit", - "amolyan", - "amíg", - "amikor", - "át", - "abban", - "ahhoz", - "annak", - "arra", - "arról", - "az", - "azok", - "azon", - "azt", - "azzal", - "azért", - "aztán", - "azután", - "azonban", - "bár", - "be", - "belül", - "benne", - "cikk", - "cikkek", - "cikkeket", - "csak", - "de", - "e", - "eddig", - "egész", - "egy", - "egyes", - "egyetlen", - "egyéb", - "egyik", - "egyre", - "ekkor", - "el", - "elég", - "ellen", - "elő", - "először", - "előtt", - "első", - "én", - "éppen", - "ebben", - "ehhez", - "emilyen", - "ennek", - "erre", - "ez", - "ezt", - "ezek", - "ezen", - "ezzel", - "ezért", - "és", - "fel", - "felé", - "hanem", - "hiszen", - "hogy", - "hogyan", - "igen", - "így", - "illetve", - "ill.", - "ill", - "ilyen", - "ilyenkor", - "ison", - "ismét", - "itt", - "jó", - "jól", - "jobban", - "kell", - "kellett", - "keresztül", - "keressünk", - "ki", - "kívül", - "között", - "közül", - "legalább", - "lehet", - "lehetett", - "legyen", - "lenne", - "lenni", - "lesz", - "lett", - "maga", - "magát", - "majd", - "majd", - "már", - "más", - "másik", - "meg", - "még", - "mellett", - "mert", - "mely", - "melyek", - "mi", - "mit", - "míg", - "miért", - "milyen", - "mikor", - "minden", - "mindent", - "mindenki", - "mindig", - "mint", - "mintha", - "mivel", - "most", - "nagy", - "nagyobb", - "nagyon", - "ne", - "néha", - "nekem", - "neki", - "nem", - "néhány", - "nélkül", - "nincs", - "olyan", - "ott", - "össze", - "ő", - "ők", - "őket", - "pedig", - "persze", - "rá", - "s", - "saját", - "sem", - "semmi", - "sok", - "sokat", - "sokkal", - "számára", - "szemben", - "szerint", - "szinte", - "talán", - "tehát", - "teljes", - "tovább", - "továbbá", - "több", - "úgy", - "ugyanis", - "új", - "újabb", - "újra", - "után", - "utána", - "utolsó", - "vagy", - "vagyis", - "valaki", - "valami", - "valamint", - "való", - "vagyok", - "van", - "vannak", - "volt", - "voltam", - "voltak", - "voltunk", - "vissza", - "vele", - "viszont", - "volna" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/schema.xml deleted file mode 100644 index a8f25bd51..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/schema.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/hungarian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json deleted file mode 100644 index d147fbd41..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json +++ /dev/null @@ -1,365 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ada", - "adanya", - "adalah", - "adapun", - "agak", - "agaknya", - "agar", - "akan", - "akankah", - "akhirnya", - "aku", - "akulah", - "amat", - "amatlah", - "anda", - "andalah", - "antar", - "diantaranya", - "antara", - "antaranya", - "diantara", - "apa", - "apaan", - "mengapa", - "apabila", - "apakah", - "apalagi", - "apatah", - "atau", - "ataukah", - "ataupun", - "bagai", - "bagaikan", - "sebagai", - "sebagainya", - "bagaimana", - "bagaimanapun", - "sebagaimana", - "bagaimanakah", - "bagi", - "bahkan", - "bahwa", - "bahwasanya", - "sebaliknya", - "banyak", - "sebanyak", - "beberapa", - "seberapa", - "begini", - "beginian", - "beginikah", - "beginilah", - "sebegini", - "begitu", - "begitukah", - "begitulah", - "begitupun", - "sebegitu", - "belum", - "belumlah", - "sebelum", - "sebelumnya", - "sebenarnya", - "berapa", - "berapakah", - "berapalah", - "berapapun", - "betulkah", - "sebetulnya", - "biasa", - "biasanya", - "bila", - "bilakah", - "bisa", - "bisakah", - "sebisanya", - "boleh", - "bolehkah", - "bolehlah", - "buat", - "bukan", - "bukankah", - "bukanlah", - "bukannya", - "cuma", - "percuma", - "dahulu", - "dalam", - "dan", - "dapat", - "dari", - "daripada", - "dekat", - "demi", - "demikian", - "demikianlah", - "sedemikian", - "dengan", - "depan", - "di", - "dia", - "dialah", - "dini", - "diri", - "dirinya", - "terdiri", - "dong", - "dulu", - "enggak", - "enggaknya", - "entah", - "entahlah", - "terhadap", - "terhadapnya", - "hal", - "hampir", - "hanya", - "hanyalah", - "harus", - "haruslah", - "harusnya", - "seharusnya", - "hendak", - "hendaklah", - "hendaknya", - "hingga", - "sehingga", - "ia", - "ialah", - "ibarat", - "ingin", - "inginkah", - "inginkan", - "ini", - "inikah", - "inilah", - "itu", - "itukah", - "itulah", - "jangan", - "jangankan", - "janganlah", - "jika", - "jikalau", - "juga", - "justru", - "kala", - "kalau", - "kalaulah", - "kalaupun", - "kalian", - "kami", - "kamilah", - "kamu", - "kamulah", - "kan", - "kapan", - "kapankah", - "kapanpun", - "dikarenakan", - "karena", - "karenanya", - "ke", - "kecil", - "kemudian", - "kenapa", - "kepada", - "kepadanya", - "ketika", - "seketika", - "khususnya", - "kini", - "kinilah", - "kiranya", - "sekiranya", - "kita", - "kitalah", - "kok", - "lagi", - "lagian", - "selagi", - "lah", - "lain", - "lainnya", - "melainkan", - "selaku", - "lalu", - "melalui", - "terlalu", - "lama", - "lamanya", - "selama", - "selama", - "selamanya", - "lebih", - "terlebih", - "bermacam", - "macam", - "semacam", - "maka", - "makanya", - "makin", - "malah", - "malahan", - "mampu", - "mampukah", - "mana", - "manakala", - "manalagi", - "masih", - "masihkah", - "semasih", - "masing", - "mau", - "maupun", - "semaunya", - "memang", - "mereka", - "merekalah", - "meski", - "meskipun", - "semula", - "mungkin", - "mungkinkah", - "nah", - "namun", - "nanti", - "nantinya", - "nyaris", - "oleh", - "olehnya", - "seorang", - "seseorang", - "pada", - "padanya", - "padahal", - "paling", - "sepanjang", - "pantas", - "sepantasnya", - "sepantasnyalah", - "para", - "pasti", - "pastilah", - "per", - "pernah", - "pula", - "pun", - "merupakan", - "rupanya", - "serupa", - "saat", - "saatnya", - "sesaat", - "saja", - "sajalah", - "saling", - "bersama", - "sama", - "sesama", - "sambil", - "sampai", - "sana", - "sangat", - "sangatlah", - "saya", - "sayalah", - "se", - "sebab", - "sebabnya", - "sebuah", - "tersebut", - "tersebutlah", - "sedang", - "sedangkan", - "sedikit", - "sedikitnya", - "segala", - "segalanya", - "segera", - "sesegera", - "sejak", - "sejenak", - "sekali", - "sekalian", - "sekalipun", - "sesekali", - "sekaligus", - "sekarang", - "sekarang", - "sekitar", - "sekitarnya", - "sela", - "selain", - "selalu", - "seluruh", - "seluruhnya", - "semakin", - "sementara", - "sempat", - "semua", - "semuanya", - "sendiri", - "sendirinya", - "seolah", - "seperti", - "sepertinya", - "sering", - "seringnya", - "serta", - "siapa", - "siapakah", - "siapapun", - "disini", - "disinilah", - "sini", - "sinilah", - "sesuatu", - "sesuatunya", - "suatu", - "sesudah", - "sesudahnya", - "sudah", - "sudahkah", - "sudahlah", - "supaya", - "tadi", - "tadinya", - "tak", - "tanpa", - "setelah", - "telah", - "tentang", - "tentu", - "tentulah", - "tentunya", - "tertentu", - "seterusnya", - "tapi", - "tetapi", - "setiap", - "tiap", - "setidaknya", - "tidak", - "tidakkah", - "tidaklah", - "toh", - "waduh", - "wah", - "wahai", - "sewaktu", - "walau", - "walaupun", - "wong", - "yaitu", - "yakni", - "yang" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/schema.xml deleted file mode 100644 index 8ad747b2c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/indonesian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json deleted file mode 100644 index 3b4f9865c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ad", - "al", - "allo", - "ai", - "agli", - "all", - "agl", - "alla", - "alle", - "con", - "col", - "coi", - "da", - "dal", - "dallo", - "dai", - "dagli", - "dall", - "dagl", - "dalla", - "dalle", - "di", - "del", - "dello", - "dei", - "degli", - "dell", - "degl", - "della", - "delle", - "in", - "nel", - "nello", - "nei", - "negli", - "nell", - "negl", - "nella", - "nelle", - "su", - "sul", - "sullo", - "sui", - "sugli", - "sull", - "sugl", - "sulla", - "sulle", - "per", - "tra", - "contro", - "io", - "tu", - "lui", - "lei", - "noi", - "voi", - "loro", - "mio", - "mia", - "miei", - "mie", - "tuo", - "tua", - "tuoi", - "tue", - "suo", - "sua", - "suoi", - "sue", - "nostro", - "nostra", - "nostri", - "nostre", - "vostro", - "vostra", - "vostri", - "vostre", - "mi", - "ti", - "ci", - "vi", - "lo", - "la", - "li", - "le", - "gli", - "ne", - "il", - "un", - "uno", - "una", - "ma", - "ed", - "se", - "perché", - "anche", - "come", - "dov", - "dove", - "che", - "chi", - "cui", - "non", - "più", - "quale", - "quanto", - "quanti", - "quanta", - "quante", - "quello", - "quelli", - "quella", - "quelle", - "questo", - "questi", - "questa", - "queste", - "si", - "tutto", - "tutti", - "a", - "c", - "e", - "i", - "l", - "o", - "ho", - "hai", - "ha", - "abbiamo", - "avete", - "hanno", - "abbia", - "abbiate", - "abbiano", - "avrò", - "avrai", - "avrà", - "avremo", - "avrete", - "avranno", - "avrei", - "avresti", - "avrebbe", - "avremmo", - "avreste", - "avrebbero", - "avevo", - "avevi", - "aveva", - "avevamo", - "avevate", - "avevano", - "ebbi", - "avesti", - "ebbe", - "avemmo", - "aveste", - "ebbero", - "avessi", - "avesse", - "avessimo", - "avessero", - "avendo", - "avuto", - "avuta", - "avuti", - "avute", - "sono", - "sei", - "è", - "siamo", - "siete", - "sia", - "siate", - "siano", - "sarò", - "sarai", - "sarà", - "saremo", - "sarete", - "saranno", - "sarei", - "saresti", - "sarebbe", - "saremmo", - "sareste", - "sarebbero", - "ero", - "eri", - "era", - "eravamo", - "eravate", - "erano", - "fui", - "fosti", - "fu", - "fummo", - "foste", - "furono", - "fossi", - "fosse", - "fossimo", - "fossero", - "essendo", - "faccio", - "fai", - "facciamo", - "fanno", - "faccia", - "facciate", - "facciano", - "farò", - "farai", - "farà", - "faremo", - "farete", - "faranno", - "farei", - "faresti", - "farebbe", - "faremmo", - "fareste", - "farebbero", - "facevo", - "facevi", - "faceva", - "facevamo", - "facevate", - "facevano", - "feci", - "facesti", - "fece", - "facemmo", - "faceste", - "fecero", - "facessi", - "facesse", - "facessimo", - "facessero", - "facendo", - "sto", - "stai", - "sta", - "stiamo", - "stanno", - "stia", - "stiate", - "stiano", - "starò", - "starai", - "starà", - "staremo", - "starete", - "staranno", - "starei", - "staresti", - "starebbe", - "staremmo", - "stareste", - "starebbero", - "stavo", - "stavi", - "stava", - "stavamo", - "stavate", - "stavano", - "stetti", - "stesti", - "stette", - "stemmo", - "steste", - "stettero", - "stessi", - "stesse", - "stessimo", - "stessero", - "stando" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/schema.xml deleted file mode 100644 index 0ee3fba92..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/schema.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/italian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/schema.xml deleted file mode 100644 index 2bf4a0712..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/japanese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/readme.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/schema.xml deleted file mode 100644 index c84964104..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/khmer/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/schema.xml deleted file mode 100644 index 4ef05dbac..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/korean/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/readme.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/schema.xml deleted file mode 100644 index e42dfc6b3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/lao/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json deleted file mode 100644 index 16358708c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "og", - "i", - "jeg", - "det", - "at", - "en", - "et", - "den", - "til", - "er", - "som", - "på", - "de", - "med", - "han", - "av", - "ikke", - "ikkje", - "der", - "så", - "var", - "meg", - "seg", - "men", - "ett", - "har", - "om", - "vi", - "min", - "mitt", - "ha", - "hadde", - "hun", - "nå", - "over", - "da", - "ved", - "fra", - "du", - "ut", - "sin", - "dem", - "oss", - "opp", - "man", - "kan", - "hans", - "hvor", - "eller", - "hva", - "skal", - "selv", - "sjøl", - "her", - "alle", - "vil", - "bli", - "ble", - "blei", - "blitt", - "kunne", - "inn", - "når", - "være", - "kom", - "noen", - "noe", - "ville", - "dere", - "som", - "deres", - "kun", - "ja", - "etter", - "ned", - "skulle", - "denne", - "for", - "deg", - "si", - "sine", - "sitt", - "mot", - "å", - "meget", - "hvorfor", - "dette", - "disse", - "uten", - "hvordan", - "ingen", - "din", - "ditt", - "blir", - "samme", - "hvilken", - "hvilke", - "sånn", - "inni", - "mellom", - "vår", - "hver", - "hvem", - "vors", - "hvis", - "både", - "bare", - "enn", - "fordi", - "før", - "mange", - "også", - "slik", - "vært", - "være", - "båe", - "begge", - "siden", - "dykk", - "dykkar", - "dei", - "deira", - "deires", - "deim", - "di", - "då", - "eg", - "ein", - "eit", - "eitt", - "elles", - "honom", - "hjå", - "ho", - "hoe", - "henne", - "hennar", - "hennes", - "hoss", - "hossen", - "ikkje", - "ingi", - "inkje", - "korleis", - "korso", - "kva", - "kvar", - "kvarhelst", - "kven", - "kvi", - "kvifor", - "me", - "medan", - "mi", - "mine", - "mykje", - "no", - "nokon", - "noka", - "nokor", - "noko", - "nokre", - "si", - "sia", - "sidan", - "so", - "somt", - "somme", - "um", - "upp", - "vere", - "vore", - "verte", - "vort", - "varte", - "vart" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/schema.xml deleted file mode 100644 index dcd1a3137..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/schema.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/norwegian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json deleted file mode 100644 index e01ce8743..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "انان", - "نداشته", - "سراسر", - "خياه", - "ايشان", - "وي", - "تاكنون", - "بيشتري", - "دوم", - "پس", - "ناشي", - "وگو", - "يا", - "داشتند", - "سپس", - "هنگام", - "هرگز", - "پنج", - "نشان", - "امسال", - "ديگر", - "گروهي", - "شدند", - "چطور", - "ده", - "و", - "دو", - "نخستين", - "ولي", - "چرا", - "چه", - "وسط", - "ه", - "كدام", - "قابل", - "يك", - "رفت", - "هفت", - "همچنين", - "در", - "هزار", - "بله", - "بلي", - "شايد", - "اما", - "شناسي", - "گرفته", - "دهد", - "داشته", - "دانست", - "داشتن", - "خواهيم", - "ميليارد", - "وقتيكه", - "امد", - "خواهد", - "جز", - "اورده", - "شده", - "بلكه", - "خدمات", - "شدن", - "برخي", - "نبود", - "بسياري", - "جلوگيري", - "حق", - "كردند", - "نوعي", - "بعري", - "نكرده", - "نظير", - "نبايد", - "بوده", - "بودن", - "داد", - "اورد", - "هست", - "جايي", - "شود", - "دنبال", - "داده", - "بايد", - "سابق", - "هيچ", - "همان", - "انجا", - "كمتر", - "كجاست", - "گردد", - "كسي", - "تر", - "مردم", - "تان", - "دادن", - "بودند", - "سري", - "جدا", - "ندارند", - "مگر", - "يكديگر", - "دارد", - "دهند", - "بنابراين", - "هنگامي", - "سمت", - "جا", - "انچه", - "خود", - "دادند", - "زياد", - "دارند", - "اثر", - "بدون", - "بهترين", - "بيشتر", - "البته", - "به", - "براساس", - "بيرون", - "كرد", - "بعضي", - "گرفت", - "توي", - "اي", - "ميليون", - "او", - "جريان", - "تول", - "بر", - "مانند", - "برابر", - "باشيم", - "مدتي", - "گويند", - "اكنون", - "تا", - "تنها", - "جديد", - "چند", - "بي", - "نشده", - "كردن", - "كردم", - "گويد", - "كرده", - "كنيم", - "نمي", - "نزد", - "روي", - "قصد", - "فقط", - "بالاي", - "ديگران", - "اين", - "ديروز", - "توسط", - "سوم", - "ايم", - "دانند", - "سوي", - "استفاده", - "شما", - "كنار", - "داريم", - "ساخته", - "طور", - "امده", - "رفته", - "نخست", - "بيست", - "نزديك", - "طي", - "كنيد", - "از", - "انها", - "تمامي", - "داشت", - "يكي", - "طريق", - "اش", - "چيست", - "روب", - "نمايد", - "گفت", - "چندين", - "چيزي", - "تواند", - "ام", - "ايا", - "با", - "ان", - "ايد", - "ترين", - "اينكه", - "ديگري", - "راه", - "هايي", - "بروز", - "همچنان", - "پاعين", - "كس", - "حدود", - "مختلف", - "مقابل", - "چيز", - "گيرد", - "ندارد", - "ضد", - "همچون", - "سازي", - "شان", - "مورد", - "باره", - "مرسي", - "خويش", - "برخوردار", - "چون", - "خارج", - "شش", - "هنوز", - "تحت", - "ضمن", - "هستيم", - "گفته", - "فكر", - "بسيار", - "پيش", - "براي", - "روزهاي", - "انكه", - "نخواهد", - "بالا", - "كل", - "وقتي", - "كي", - "چنين", - "كه", - "گيري", - "نيست", - "است", - "كجا", - "كند", - "نيز", - "يابد", - "بندي", - "حتي", - "توانند", - "عقب", - "خواست", - "كنند", - "بين", - "تمام", - "همه", - "ما", - "باشند", - "مثل", - "شد", - "اري", - "باشد", - "اره", - "طبق", - "بعد", - "اگر", - "صورت", - "غير", - "جاي", - "بيش", - "ريزي", - "اند", - "زيرا", - "چگونه", - "بار", - "لطفا", - "مي", - "درباره", - "من", - "ديده", - "همين", - "گذاري", - "برداري", - "علت", - "گذاشته", - "هم", - "فوق", - "نه", - "ها", - "شوند", - "اباد", - "همواره", - "هر", - "اول", - "خواهند", - "چهار", - "نام", - "امروز", - "مان", - "هاي", - "قبل", - "كنم", - "سعي", - "تازه", - "را", - "هستند", - "زير", - "جلوي", - "عنوان", - "بود" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/schema.xml deleted file mode 100644 index f1bf0553a..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/schema.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/persian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json deleted file mode 100644 index 468b5820b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "aby", - "ach", - "acz", - "aczkolwiek", - "aj", - "albo", - "ale", - "ależ", - "aż", - "bardziej", - "bardzo", - "bez", - "bo", - "bowiem", - "by", - "byli", - "bynajmniej", - "być", - "był", - "była", - "było", - "były", - "będzie", - "będą", - "cali", - "cała", - "cały", - "ci", - "cię", - "ciebie", - "co", - "cokolwiek", - "coś", - "czasami", - "czasem", - "czemu", - "czy", - "czyli", - "daleko", - "dla", - "dlaczego", - "dlatego", - "do", - "dobrze", - "dokąd", - "dość", - "dużo", - "dwa", - "dwaj", - "dwie", - "dwoje", - "dziś", - "dzisiaj", - "gdy", - "gdyby", - "gdyż", - "gdzie", - "gdziekolwiek", - "gdzieś", - "go", - "i", - "ich", - "ile", - "im", - "inna", - "inne", - "inny", - "innych", - "iż", - "ja", - "ją", - "jak", - "jakaś", - "jakby", - "jaki", - "jakichś", - "jakie", - "jakiś", - "jakiż", - "jakkolwiek", - "jako", - "jakoś", - "je", - "jeden", - "jedna", - "jedno", - "jednak", - "jednakże", - "jego", - "jej", - "jemu", - "jest", - "jestem", - "jeszcze", - "jeśli", - "jeżeli", - "już", - "ją", - "każdy", - "kiedy", - "kilka", - "kimś", - "kto", - "ktokolwiek", - "ktoś", - "która", - "które", - "którego", - "której", - "który", - "których", - "którym", - "którzy", - "ku", - "lat", - "lecz", - "lub", - "ma", - "mają", - "mam", - "mi", - "mimo", - "między", - "mną", - "mnie", - "mogą", - "moi", - "moim", - "moja", - "moje", - "może", - "możliwe", - "można", - "mój", - "mu", - "musi", - "my", - "na", - "nad", - "nam", - "nami", - "nas", - "nasi", - "nasz", - "nasza", - "nasze", - "naszego", - "naszych", - "natomiast", - "natychmiast", - "nawet", - "nią", - "nic", - "nich", - "nie", - "niego", - "niej", - "niemu", - "nigdy", - "nim", - "nimi", - "niż", - "no", - "o", - "obok", - "od", - "około", - "on", - "ona", - "one", - "oni", - "ono", - "oraz", - "oto", - "owszem", - "pan", - "pana", - "pani", - "po", - "pod", - "podczas", - "pomimo", - "ponad", - "ponieważ", - "powinien", - "powinna", - "powinni", - "powinno", - "poza", - "prawie", - "przecież", - "przed", - "przede", - "przedtem", - "przez", - "przy", - "roku", - "również", - "sam", - "sama", - "są", - "się", - "skąd", - "sobie", - "sobą", - "sposób", - "swoje", - "ta", - "tak", - "taka", - "taki", - "takie", - "także", - "tam", - "te", - "tego", - "tej", - "ten", - "teraz", - "też", - "to", - "tobą", - "tobie", - "toteż", - "trzeba", - "tu", - "tutaj", - "twoi", - "twoim", - "twoja", - "twoje", - "twym", - "twój", - "ty", - "tych", - "tylko", - "tym", - "u", - "w", - "wam", - "wami", - "was", - "wasz", - "wasza", - "wasze", - "we", - "według", - "wiele", - "wielu", - "więc", - "więcej", - "wszyscy", - "wszystkich", - "wszystkie", - "wszystkim", - "wszystko", - "wtedy", - "wy", - "właśnie", - "z", - "za", - "zapewne", - "zawsze", - "ze", - "znowu", - "znów", - "został", - "żaden", - "żadna", - "żadne", - "żadnych", - "że", - "żeby" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/protwords.txt deleted file mode 100644 index c0be26e39..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/protwords.txt +++ /dev/null @@ -1,17 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/schema.xml deleted file mode 100644 index a4e3ec392..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/schema.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/polish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json deleted file mode 100644 index 6ba584855..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "a", - "o", - "que", - "e", - "do", - "da", - "em", - "um", - "para", - "com", - "não", - "uma", - "os", - "no", - "se", - "na", - "por", - "mais", - "as", - "dos", - "como", - "mas", - "ao", - "ele", - "das", - "à", - "seu", - "sua", - "ou", - "quando", - "muito", - "nos", - "já", - "eu", - "também", - "só", - "pelo", - "pela", - "até", - "isso", - "ela", - "entre", - "depois", - "sem", - "mesmo", - "aos", - "seus", - "quem", - "nas", - "me", - "esse", - "eles", - "você", - "essa", - "num", - "nem", - "suas", - "meu", - "às", - "minha", - "numa", - "pelos", - "elas", - "qual", - "nós", - "lhe", - "deles", - "essas", - "esses", - "pelas", - "este", - "dele", - "tu", - "te", - "vocês", - "vos", - "lhes", - "meus", - "minhas", - "teu", - "tua", - "teus", - "tuas", - "nosso", - "nossa", - "nossos", - "nossas", - "dela", - "delas", - "esta", - "estes", - "estas", - "aquele", - "aquela", - "aqueles", - "aquelas", - "isto", - "aquilo", - "estou", - "está", - "estamos", - "estão", - "estive", - "esteve", - "estivemos", - "estiveram", - "estava", - "estávamos", - "estavam", - "estivera", - "estivéramos", - "esteja", - "estejamos", - "estejam", - "estivesse", - "estivéssemos", - "estivessem", - "estiver", - "estivermos", - "estiverem", - "hei", - "há", - "havemos", - "hão", - "houve", - "houvemos", - "houveram", - "houvera", - "houvéramos", - "haja", - "hajamos", - "hajam", - "houvesse", - "houvéssemos", - "houvessem", - "houver", - "houvermos", - "houverem", - "houverei", - "houverá", - "houveremos", - "houverão", - "houveria", - "houveríamos", - "houveriam", - "sou", - "somos", - "são", - "era", - "éramos", - "eram", - "fui", - "foi", - "fomos", - "foram", - "fora", - "fôramos", - "seja", - "sejamos", - "sejam", - "fosse", - "fôssemos", - "fossem", - "for", - "formos", - "forem", - "serei", - "será", - "seremos", - "serão", - "seria", - "seríamos", - "seriam", - "tenho", - "tem", - "temos", - "tém", - "tinha", - "tínhamos", - "tinham", - "tive", - "teve", - "tivemos", - "tiveram", - "tivera", - "tivéramos", - "tenha", - "tenhamos", - "tenham", - "tivesse", - "tivéssemos", - "tivessem", - "tiver", - "tivermos", - "tiverem", - "terei", - "terá", - "teremos", - "terão", - "teria", - "teríamos", - "teriam" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/schema.xml deleted file mode 100644 index 983019afd..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/schema.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/synonyms.txt deleted file mode 100644 index 632aadf0d..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/portuguese/synonyms.txt +++ /dev/null @@ -1,16 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json deleted file mode 100644 index 639df83c3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "acea", - "aceasta", - "această", - "aceea", - "acei", - "aceia", - "acel", - "acela", - "acele", - "acelea", - "acest", - "acesta", - "aceste", - "acestea", - "aceşti", - "aceştia", - "acolo", - "acum", - "ai", - "aia", - "aibă", - "aici", - "al", - "ăla", - "ale", - "alea", - "ălea", - "altceva", - "altcineva", - "am", - "ar", - "are", - "aş", - "aşadar", - "asemenea", - "asta", - "ăsta", - "astăzi", - "astea", - "ăstea", - "ăştia", - "asupra", - "aţi", - "au", - "avea", - "avem", - "aveţi", - "azi", - "bine", - "bucur", - "bună", - "ca", - "că", - "căci", - "când", - "care", - "cărei", - "căror", - "cărui", - "cât", - "câte", - "câţi", - "către", - "câtva", - "ce", - "cel", - "ceva", - "chiar", - "cînd", - "cine", - "cineva", - "cît", - "cîte", - "cîţi", - "cîtva", - "contra", - "cu", - "cum", - "cumva", - "curând", - "curînd", - "da", - "dă", - "dacă", - "dar", - "datorită", - "de", - "deci", - "deja", - "deoarece", - "departe", - "deşi", - "din", - "dinaintea", - "dintr", - "dintre", - "drept", - "după", - "ea", - "ei", - "el", - "ele", - "eram", - "este", - "eşti", - "eu", - "face", - "fără", - "fi", - "fie", - "fiecare", - "fii", - "fim", - "fiţi", - "iar", - "ieri", - "îi", - "îl", - "îmi", - "împotriva", - "în", - "înainte", - "înaintea", - "încât", - "încît", - "încotro", - "între", - "întrucât", - "întrucît", - "îţi", - "la", - "lângă", - "le", - "li", - "lîngă", - "lor", - "lui", - "mă", - "mâine", - "mea", - "mei", - "mele", - "mereu", - "meu", - "mi", - "mine", - "mult", - "multă", - "mulţi", - "ne", - "nicăieri", - "nici", - "nimeni", - "nişte", - "noastră", - "noastre", - "noi", - "noştri", - "nostru", - "nu", - "ori", - "oricând", - "oricare", - "oricât", - "orice", - "oricînd", - "oricine", - "oricît", - "oricum", - "oriunde", - "până", - "pe", - "pentru", - "peste", - "pînă", - "poate", - "pot", - "prea", - "prima", - "primul", - "prin", - "printr", - "sa", - "să", - "săi", - "sale", - "sau", - "său", - "se", - "şi", - "sînt", - "sîntem", - "sînteţi", - "spre", - "sub", - "sunt", - "suntem", - "sunteţi", - "ta", - "tăi", - "tale", - "tău", - "te", - "ţi", - "ţie", - "tine", - "toată", - "toate", - "tot", - "toţi", - "totuşi", - "tu", - "un", - "una", - "unde", - "undeva", - "unei", - "unele", - "uneori", - "unor", - "vă", - "vi", - "voastră", - "voastre", - "voi", - "voştri", - "vostru", - "vouă", - "vreo", - "vreun" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/schema.xml deleted file mode 100644 index fff75c8c7..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/schema.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/romanian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json deleted file mode 100644 index f0b3051b4..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "и", - "в", - "во", - "не", - "что", - "он", - "на", - "я", - "с", - "со", - "как", - "а", - "то", - "все", - "она", - "так", - "его", - "но", - "да", - "ты", - "к", - "у", - "же", - "вы", - "за", - "бы", - "по", - "только", - "ее", - "мне", - "было", - "вот", - "от", - "меня", - "еще", - "нет", - "о", - "из", - "ему", - "теперь", - "когда", - "даже", - "ну", - "вдруг", - "ли", - "если", - "уже", - "или", - "ни", - "быть", - "был", - "него", - "до", - "вас", - "нибудь", - "опять", - "уж", - "вам", - "сказал", - "ведь", - "там", - "потом", - "себя", - "ничего", - "ей", - "может", - "они", - "тут", - "где", - "есть", - "надо", - "ней", - "для", - "мы", - "тебя", - "их", - "чем", - "была", - "сам", - "чтоб", - "без", - "будто", - "человек", - "чего", - "раз", - "тоже", - "себе", - "под", - "жизнь", - "будет", - "ж", - "тогда", - "кто", - "этот", - "говорил", - "того", - "потому", - "этого", - "какой", - "совсем", - "ним", - "здесь", - "этом", - "один", - "почти", - "мой", - "тем", - "чтобы", - "нее", - "кажется", - "сейчас", - "были", - "куда", - "зачем", - "сказать", - "всех", - "никогда", - "сегодня", - "можно", - "при", - "наконец", - "два", - "об", - "другой", - "хоть", - "после", - "над", - "больше", - "тот", - "через", - "эти", - "нас", - "про", - "всего", - "них", - "какая", - "много", - "разве", - "сказала", - "три", - "эту", - "моя", - "впрочем", - "хорошо", - "свою", - "этой", - "перед", - "иногда", - "лучше", - "чуть", - "том", - "нельзя", - "такой", - "им", - "более", - "всегда", - "конечно", - "всю", - "между" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/schema.xml deleted file mode 100644 index 138c30245..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/schema.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/russian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/solrconfig.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/solrconfig.xml deleted file mode 100644 index f8c9a92cd..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/solrconfig.xml +++ /dev/null @@ -1,550 +0,0 @@ - - - - - 4.10.4 - - - ${solr.abortOnConfigurationError:true} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - native - true - - - - - - - ${solr.data.dir:} - - - - 100 - 3600000 - true - - - - - 1000 - - - - - - 1024 - - - - - - - - true - - 50 - - 200 - - - - - - - - - - - - - - - false - - 5 - - - - - - - - - - - - - - - edismax - explicit - OR - content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0 - content^2.0 - content - 15 - - 2<-35% - - title,content - 3 - true - true - - content - 200 - - false - false - false - 1 - default - wordbreak - - json - true - - - - spellcheck - elevator - - - - - - - true - json - true - - - - - - - explicit - - - velocity - - browse - layout - Solritas - - content - edismax - *:* - 10 - *,score - content^0.5 title^1.2 keywords^2.0 - content,title,keywords - 3 - - content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0 - - on - type - site - author - keywords - fileMimeType - appKey - 1 - - true - true - - - on - title content - html - <b> - </b> - - - spellcheck - - - - - - - 1 - 1 - 3 - 15 - 20 - false - - - - - - - - - - - - - - - - - - - - - true - - - termsComponent - - - - - - - explicit - - - elevator - - - - - - - - - - solrpingquery - - - all - id - - - - - - - explicit - true - - - - - - - - - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - - clusteringComponent - - - - - - - - default - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - 20 - - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - textSpell - - - default - spell - solr.DirectSolrSpellChecker - internal - 0.5 - 2 - 1 - 5 - 3 - 0.01 - - - - - wordbreak - solr.WordBreakSolrSpellChecker - spell - - - - - - - - - string - elevate.xml - true - - - - - - - - - - 100 - - - - - - - 70 - 0.5 - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - , - ]]> - - ]]> - - - - - - - - 60 - endtime - - - - - - - - - - - - 5 - - - - - - - - - - html - - - - - - - - *:* - - - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json deleted file mode 100644 index bb07f37f6..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "la", - "que", - "el", - "en", - "y", - "a", - "los", - "del", - "se", - "las", - "por", - "un", - "para", - "con", - "no", - "una", - "su", - "al", - "lo", - "como", - "más", - "pero", - "sus", - "le", - "ya", - "o", - "este", - "sí", - "porque", - "esta", - "entre", - "cuando", - "muy", - "sin", - "sobre", - "también", - "me", - "hasta", - "hay", - "donde", - "quien", - "desde", - "todo", - "nos", - "durante", - "todos", - "uno", - "les", - "ni", - "contra", - "otros", - "ese", - "eso", - "ante", - "ellos", - "e", - "esto", - "mí", - "antes", - "algunos", - "qué", - "unos", - "yo", - "otro", - "otras", - "otra", - "él", - "tanto", - "esa", - "estos", - "mucho", - "quienes", - "nada", - "muchos", - "cual", - "poco", - "ella", - "estar", - "estas", - "algunas", - "algo", - "nosotros", - "mi", - "mis", - "tú", - "te", - "ti", - "tu", - "tus", - "ellas", - "nosotras", - "vosotros", - "vosotras", - "os", - "mío", - "mía", - "míos", - "mías", - "tuyo", - "tuya", - "tuyos", - "tuyas", - "suyo", - "suya", - "suyos", - "suyas", - "nuestro", - "nuestra", - "nuestros", - "nuestras", - "vuestro", - "vuestra", - "vuestros", - "vuestras", - "esos", - "esas", - "estoy", - "estás", - "está", - "estamos", - "estáis", - "están", - "esté", - "estés", - "estemos", - "estéis", - "estén", - "estaré", - "estarás", - "estará", - "estaremos", - "estaréis", - "estarán", - "estaría", - "estarías", - "estaríamos", - "estaríais", - "estarían", - "estaba", - "estabas", - "estábamos", - "estabais", - "estaban", - "estuve", - "estuviste", - "estuvo", - "estuvimos", - "estuvisteis", - "estuvieron", - "estuviera", - "estuvieras", - "estuviéramos", - "estuvierais", - "estuvieran", - "estuviese", - "estuvieses", - "estuviésemos", - "estuvieseis", - "estuviesen", - "estando", - "estado", - "estada", - "estados", - "estadas", - "estad", - "he", - "has", - "ha", - "hemos", - "habéis", - "han", - "haya", - "hayas", - "hayamos", - "hayáis", - "hayan", - "habré", - "habrás", - "habrá", - "habremos", - "habréis", - "habrán", - "habría", - "habrías", - "habríamos", - "habríais", - "habrían", - "había", - "habías", - "habíamos", - "habíais", - "habían", - "hube", - "hubiste", - "hubo", - "hubimos", - "hubisteis", - "hubieron", - "hubiera", - "hubieras", - "hubiéramos", - "hubierais", - "hubieran", - "hubiese", - "hubieses", - "hubiésemos", - "hubieseis", - "hubiesen", - "habiendo", - "habido", - "habida", - "habidos", - "habidas", - "soy", - "eres", - "es", - "somos", - "sois", - "son", - "sea", - "seas", - "seamos", - "seáis", - "sean", - "seré", - "serás", - "será", - "seremos", - "seréis", - "serán", - "sería", - "serías", - "seríamos", - "seríais", - "serían", - "era", - "eras", - "éramos", - "erais", - "eran", - "fui", - "fuiste", - "fue", - "fuimos", - "fuisteis", - "fueron", - "fuera", - "fueras", - "fuéramos", - "fuerais", - "fueran", - "fuese", - "fueses", - "fuésemos", - "fueseis", - "fuesen", - "siendo", - "sido", - "tengo", - "tienes", - "tiene", - "tenemos", - "tenéis", - "tienen", - "tenga", - "tengas", - "tengamos", - "tengáis", - "tengan", - "tendré", - "tendrás", - "tendrá", - "tendremos", - "tendréis", - "tendrán", - "tendría", - "tendrías", - "tendríamos", - "tendríais", - "tendrían", - "tenía", - "tenías", - "teníamos", - "teníais", - "tenían", - "tuve", - "tuviste", - "tuvo", - "tuvimos", - "tuvisteis", - "tuvieron", - "tuviera", - "tuvieras", - "tuviéramos", - "tuvierais", - "tuvieran", - "tuviese", - "tuvieses", - "tuviésemos", - "tuvieseis", - "tuviesen", - "teniendo", - "tenido", - "tenida", - "tenidos", - "tenidas", - "tened" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/schema.xml deleted file mode 100644 index 694dd05cd..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/schema.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/spanish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json deleted file mode 100644 index 919377766..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "och", - "det", - "att", - "i", - "en", - "jag", - "hon", - "som", - "han", - "på", - "den", - "med", - "var", - "sig", - "för", - "så", - "till", - "är", - "men", - "ett", - "om", - "hade", - "de", - "av", - "icke", - "mig", - "du", - "henne", - "då", - "sin", - "nu", - "har", - "inte", - "hans", - "honom", - "skulle", - "hennes", - "där", - "min", - "man", - "ej", - "vid", - "kunde", - "något", - "från", - "ut", - "när", - "efter", - "upp", - "vi", - "dem", - "vara", - "vad", - "över", - "än", - "dig", - "kan", - "sina", - "här", - "ha", - "mot", - "alla", - "under", - "någon", - "eller", - "allt", - "mycket", - "sedan", - "ju", - "denna", - "själv", - "detta", - "åt", - "utan", - "varit", - "hur", - "ingen", - "mitt", - "ni", - "bli", - "blev", - "oss", - "din", - "dessa", - "några", - "deras", - "blir", - "mina", - "samma", - "vilken", - "er", - "sådan", - "vår", - "blivit", - "dess", - "inom", - "mellan", - "sådant", - "varför", - "varje", - "vilka", - "ditt", - "vem", - "vilket", - "sitta", - "sådana", - "vart", - "dina", - "vars", - "vårt", - "våra", - "ert", - "era", - "vilkas" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/schema.xml deleted file mode 100644 index 7cb93e29c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/schema.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/swedish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/schema.xml deleted file mode 100644 index f79ebf716..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/schema.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/thai/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json deleted file mode 100644 index 2075844aa..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "acaba", - "altmış", - "altı", - "ama", - "ancak", - "arada", - "aslında", - "ayrıca", - "bana", - "bazı", - "belki", - "ben", - "benden", - "beni", - "benim", - "beri", - "beş", - "bile", - "bin", - "bir", - "birçok", - "biri", - "birkaç", - "birkez", - "birşey", - "birşeyi", - "biz", - "bize", - "bizden", - "bizi", - "bizim", - "böyle", - "böylece", - "bu", - "buna", - "bunda", - "bundan", - "bunlar", - "bunları", - "bunların", - "bunu", - "bunun", - "burada", - "çok", - "çünkü", - "da", - "daha", - "dahi", - "de", - "defa", - "değil", - "diğer", - "diye", - "doksan", - "dokuz", - "dolayı", - "dolayısıyla", - "dört", - "edecek", - "eden", - "ederek", - "edilecek", - "ediliyor", - "edilmesi", - "ediyor", - "eğer", - "elli", - "en", - "etmesi", - "etti", - "ettiği", - "ettiğini", - "gibi", - "göre", - "halen", - "hangi", - "hatta", - "hem", - "henüz", - "hep", - "hepsi", - "her", - "herhangi", - "herkesin", - "hiç", - "hiçbir", - "için", - "iki", - "ile", - "ilgili", - "ise", - "işte", - "itibaren", - "itibariyle", - "kadar", - "karşın", - "katrilyon", - "kendi", - "kendilerine", - "kendini", - "kendisi", - "kendisine", - "kendisini", - "kez", - "ki", - "kim", - "kimden", - "kime", - "kimi", - "kimse", - "kırk", - "milyar", - "milyon", - "mu", - "mü", - "mı", - "nasıl", - "ne", - "neden", - "nedenle", - "nerde", - "nerede", - "nereye", - "niye", - "niçin", - "o", - "olan", - "olarak", - "oldu", - "olduğu", - "olduğunu", - "olduklarını", - "olmadı", - "olmadığı", - "olmak", - "olması", - "olmayan", - "olmaz", - "olsa", - "olsun", - "olup", - "olur", - "olursa", - "oluyor", - "on", - "ona", - "ondan", - "onlar", - "onlardan", - "onları", - "onların", - "onu", - "onun", - "otuz", - "oysa", - "öyle", - "pek", - "rağmen", - "sadece", - "sanki", - "sekiz", - "seksen", - "sen", - "senden", - "seni", - "senin", - "siz", - "sizden", - "sizi", - "sizin", - "şey", - "şeyden", - "şeyi", - "şeyler", - "şöyle", - "şu", - "şuna", - "şunda", - "şundan", - "şunları", - "şunu", - "tarafından", - "trilyon", - "tüm", - "üç", - "üzere", - "var", - "vardı", - "ve", - "veya", - "ya", - "yani", - "yapacak", - "yapılan", - "yapılması", - "yapıyor", - "yapmak", - "yaptı", - "yaptığı", - "yaptığını", - "yaptıkları", - "yedi", - "yerine", - "yetmiş", - "yine", - "yirmi", - "yoksa", - "yüz", - "zaten" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/schema.xml deleted file mode 100644 index 893375a5e..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/schema.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/turkish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json b/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json deleted file mode 100644 index f0b3051b4..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "и", - "в", - "во", - "не", - "что", - "он", - "на", - "я", - "с", - "со", - "как", - "а", - "то", - "все", - "она", - "так", - "его", - "но", - "да", - "ты", - "к", - "у", - "же", - "вы", - "за", - "бы", - "по", - "только", - "ее", - "мне", - "было", - "вот", - "от", - "меня", - "еще", - "нет", - "о", - "из", - "ему", - "теперь", - "когда", - "даже", - "ну", - "вдруг", - "ли", - "если", - "уже", - "или", - "ни", - "быть", - "был", - "него", - "до", - "вас", - "нибудь", - "опять", - "уж", - "вам", - "сказал", - "ведь", - "там", - "потом", - "себя", - "ничего", - "ей", - "может", - "они", - "тут", - "где", - "есть", - "надо", - "ней", - "для", - "мы", - "тебя", - "их", - "чем", - "была", - "сам", - "чтоб", - "без", - "будто", - "человек", - "чего", - "раз", - "тоже", - "себе", - "под", - "жизнь", - "будет", - "ж", - "тогда", - "кто", - "этот", - "говорил", - "того", - "потому", - "этого", - "какой", - "совсем", - "ним", - "здесь", - "этом", - "один", - "почти", - "мой", - "тем", - "чтобы", - "нее", - "кажется", - "сейчас", - "были", - "куда", - "зачем", - "сказать", - "всех", - "никогда", - "сегодня", - "можно", - "при", - "наконец", - "два", - "об", - "другой", - "хоть", - "после", - "над", - "больше", - "тот", - "через", - "эти", - "нас", - "про", - "всего", - "них", - "какая", - "много", - "разве", - "сказала", - "три", - "эту", - "моя", - "впрочем", - "хорошо", - "свою", - "этой", - "перед", - "иногда", - "лучше", - "чуть", - "том", - "нельзя", - "такой", - "им", - "более", - "всегда", - "конечно", - "всю", - "между" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/protwords.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/schema.xml b/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/schema.xml deleted file mode 100644 index a15027d29..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/schema.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/synonyms.txt b/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/ukrainian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/VM_global_library.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/VM_global_library.vm deleted file mode 100644 index 3dd880c46..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/VM_global_library.vm +++ /dev/null @@ -1,161 +0,0 @@ - -#macro(param $key)$request.params.get($key)#end - -#macro(url_for_solr)/solr#if($request.core.name != "")/$request.core.name#end#end -#macro(url_for_home)#url_for_solr/browse#end - -#macro(q)&q=$!{esc.url($params.get('q'))}#end - -#macro(fqs $p)#foreach($fq in $p)#if($velocityCount>1)&#{end}fq=$esc.url($fq)#end#end - -#macro(debug)#if($request.params.get('debugQuery'))&debugQuery=true#end#end - -#macro(boostPrice)#if($request.params.get('bf') == 'price')&bf=price#end#end - -#macro(annotate)#if($request.params.get('annotateBrowse'))&annotateBrowse=true#end#end - -#macro(annTitle $msg)#if($annotate == true)title="$msg"#end#end - -#macro(spatial)#if($request.params.get('sfield'))&sfield=store#end#if($request.params.get('pt'))&pt=$request.params.get('pt')#end#if($request.params.get('d'))&d=$request.params.get('d')#end#end - -#macro(qOpts)#set($queryOpts = $request.params.get("queryOpts"))#if($queryOpts && $queryOpts != "")&queryOpts=$queryOpts#end#end - -#macro(group)#if($request.params.getBool("group") == true)&group=true#end#if($request.params.get("group.field"))#foreach($grp in $request.params.getParams('group.field'))&group.field=$grp#end#end#end - -#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#debug#boostPrice#annotate#spatial#qOpts#group#end -#macro(lens)#lensNoQ#q#end - - -#macro(url_for_lens)#{url_for_home}#lens#end - -#macro(url_for_start $start)#url_for_home#lens&start=$start#end - -#macro(url_for_filters $p)#url_for_home?#q#boostPrice#spatial#qOpts#if($list.size($p) > 0)&#fqs($p)#end#debug#end - - -#macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end - -## TODO: convert to use {!raw f=$field}$value (with escaping of course) -#macro(url_for_facet_filter $field $value)#url_for_home#lens&fq=$esc.url($field):%22$esc.url($value)%22#end - -#macro(url_for_facet_date_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end - -#macro(url_for_facet_range_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end - - -#macro(link_to_previous_page $text) - #if($page.current_page_number > 1) - #set($prev_start = $page.start - $page.results_per_page) - $text - #end -#end - -#macro(link_to_next_page $text) - #if($page.current_page_number < $page.page_count) - #set($next_start = $page.start + $page.results_per_page) - $text - #end -#end - -#macro(link_to_page $page_number $text) - #if($page_number == $page.current_page_number) - $text - #else - #if($page_number <= $page.page_count) - #set($page_start = $page_number * $page.results_per_page - $page.results_per_page) - $text - #end - #end -#end - -#macro(display_facet_query $field, $display, $fieldName) - #if($field.size() > 0) - $display -
    - #foreach ($facet in $field) - #if ($facet.value > 0) - #set($facetURL = "#url_for_nested_facet_query($facet.key)") - #if ($facetURL != '') -
  • $facet.key ($facet.value)
    • - #end - #end - #end -
- #end -#end - - -#macro(display_facet_range $field, $display, $fieldName, $start, $end, $gap, $before, $after) - $display -
    - #if($before && $before != "") - #set($value = "[* TO " + "#format_value($start)" + "]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") -
  • Less than #format_value($start) ($before)
    • - #end - #foreach ($facet in $field) - #set($rangeEnd = "#range_get_to_value($facet.key, $gap)") - #set($value = "[" + $facet.key + " TO " + $rangeEnd + "]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") - #if ($facetURL != '') -
  • $facet.key - #format_value($rangeEnd) ($facet.value)
    • - #end - #end - #if($end && $end != "" && $after > 0) - #set($value = "[" + "#format_value($end)" + " TO *]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") -
  • More than #format_value($end) ($after)
    • - #end -
-#end - -## $pivots is a list of facet_pivot -#macro(display_facet_pivot $pivots, $display) - #if($pivots.size() > 0) - $display - - #end -#end - -#macro(field $f) - #if($response.response.highlighting.get($docId).get($f).get(0)) - $!response.response.highlighting.get($docId).get($f).get(0) - #else - #foreach($v in $doc.getFieldValues($f)) - $v - #end - #end -#end - -#macro(utc_date $theDate) -$date.format("yyyy-MM-dd'T'HH:mm:ss'Z'",$theDate,$date.getLocale(),$date.getTimeZone().getTimeZone("UTC"))## -#end - -#macro(format_value $val) -#if(${val.class.name} == "java.util.Date") -#utc_date($val)## -#else -$val## -#end -#end - -#macro(range_get_to_value $inval, $gapval) -#if(${gapval.class.name} == "java.lang.String") -$inval$gapval## -#elseif(${gapval.class.name} == "java.lang.Float" || ${inval.class.name} == "java.lang.Float") -$math.toDouble($math.add($inval,$gapval))## -#else -$math.add($inval,$gapval)## -#end -#end \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/browse.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/browse.vm deleted file mode 100644 index d7c3c4352..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/browse.vm +++ /dev/null @@ -1,45 +0,0 @@ -#set($searcher=$request.searcher) -#set($params=$request.params) -#set($clusters = $response.response.clusters) -#set($mltResults = $response.response.get("moreLikeThis")) -#set($annotate = $params.get("annotateBrowse")) -#parse('query.vm') -#if($response.response.spellcheck.suggestions and $response.response.spellcheck.suggestions.size() > 0) - Did you mean $response.response.spellcheck.suggestions.collation? -#end - -
- #parse("facets.vm") -
- - - -
- #if($response.response.get('grouped')) - #foreach($grouping in $response.response.get('grouped')) - #parse("hitGrouped.vm") - #end - #else - #foreach($doc in $response.results) - #parse("hit.vm") - #end - #end -
- - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/doc.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/doc.vm deleted file mode 100644 index a9bc3fcd3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/doc.vm +++ /dev/null @@ -1,39 +0,0 @@ -
#field('title')#if($params.getBool('mlt', false) == false)More Like This#end
-
Content: #field('content')
-
Keywords: #field('keywords')
-
Author: #field('author')
-
- #set($mlt = $mltResults.get($docId)) - #set($mltOn = $params.getBool('mlt')) - #if($mltOn == true)
Similar Items
#end - #if ($mltOn && $mlt && $mlt.size() > 0) -
    - #foreach($mltHit in $mlt) - #set($mltId = $mltHit.getFieldValue('id')) -
  • -
    Title: $mltHit.getFieldValue('title')
    -
    Content: $mltHit.getFieldValue('content') -
    • - #end -
- #elseif($mltOn && $mlt.size() == 0) -
No Similar Items Found
- #end -
-#if($params.getBool("debugQuery",false)) - toggle explain - 
$response.getExplainMap().get($doc.getFirstValue('id'))
- toggle all fields - - #foreach($fieldname in $doc.fieldNames) -
- $fieldname : - - #foreach($value in $doc.getFieldValues($fieldname)) - $value - #end - - #end -
- -#end \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facet_fields.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facet_fields.vm deleted file mode 100644 index 7b9d427d2..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facet_fields.vm +++ /dev/null @@ -1,12 +0,0 @@ -#if($response.facetFields) -

Facets

- #foreach($field in $response.facetFields) - $field.name - -
    - #foreach($facet in $field.values) -
  • $facet.name ($facet.count)
    • - #end -
- #end - #end \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facets.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facets.vm deleted file mode 100644 index 98c92eba5..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/facets.vm +++ /dev/null @@ -1 +0,0 @@ -#parse('facet_fields.vm') diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/footer.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/footer.vm deleted file mode 100644 index 90f61cef5..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/footer.vm +++ /dev/null @@ -1,16 +0,0 @@ -
-
- Options: - #if($request.params.get('debugQuery')) - disable debug - #else - enable debug - #end - #if($annotate) - disable annotation - #else - enable annotation - #end - XML
- -
Documentation: Solr Home Page, Solr Wiki
diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/head.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/head.vm deleted file mode 100644 index 8b4154222..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/head.vm +++ /dev/null @@ -1,45 +0,0 @@ - - ## An example of using an arbitrary request parameter - - -#param('title') - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/header.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/header.vm deleted file mode 100644 index 15c3870a0..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/header.vm +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hit.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hit.vm deleted file mode 100644 index 5cd4fe8d8..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hit.vm +++ /dev/null @@ -1,5 +0,0 @@ -#set($docId = $doc.getFieldValue('id')) - -
- #parse("doc.vm") -
diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hitGrouped.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hitGrouped.vm deleted file mode 100644 index c3cccf4b3..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/hitGrouped.vm +++ /dev/null @@ -1,18 +0,0 @@ -
-
$grouping.key
-
Total Matches in Group: $grouping.value.matches
-
#foreach ($group in $grouping.value.groups) -
$group.groupValue ($group.doclist.numFound)
-
- #foreach ($doc in $group.doclist) - #set($docId = $doc.getFieldValue('id')) - #parse("doc.vm") - #end -
- #end
-
- #if($params.getBool("debugQuery",false)) - toggle explain - 
$response.getExplainMap().get($doc.getFirstValue('id'))
- #end - diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.css b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.css deleted file mode 100644 index 91b622833..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.css +++ /dev/null @@ -1,48 +0,0 @@ -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url('indicator.gif') right center no-repeat; -} - -.ac_odd { - background-color: #eee; -} - -.ac_over { - background-color: #0A246A; - color: white; -} diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.js b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.js deleted file mode 100644 index f1b2642e7..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/jquery.autocomplete.js +++ /dev/null @@ -1,762 +0,0 @@ -/* - * Autocomplete - jQuery plugin 1.1pre - * - * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Revision: $Id: jquery.autocomplete.js 5785 2008-07-12 10:37:33Z joern.zaefferer $ - * - */ - -;(function($) { - -$.fn.extend({ - autocomplete: function(urlOrData, options) { - var isUrl = typeof urlOrData == "string"; - options = $.extend({}, $.Autocompleter.defaults, { - url: isUrl ? urlOrData : null, - data: isUrl ? null : urlOrData, - delay: isUrl ? $.Autocompleter.defaults.delay : 10, - max: options && !options.scroll ? 10 : 150 - }, options); - - // if highlight is set to false, replace it with a do-nothing function - options.highlight = options.highlight || function(value) { return value; }; - - // if the formatMatch option is not specified, then use formatItem for backwards compatibility - options.formatMatch = options.formatMatch || options.formatItem; - - return this.each(function() { - new $.Autocompleter(this, options); - }); - }, - result: function(handler) { - return this.bind("result", handler); - }, - search: function(handler) { - return this.trigger("search", [handler]); - }, - flushCache: function() { - return this.trigger("flushCache"); - }, - setOptions: function(options){ - return this.trigger("setOptions", [options]); - }, - unautocomplete: function() { - return this.trigger("unautocomplete"); - } -}); - -$.Autocompleter = function(input, options) { - - var KEY = { - UP: 38, - DOWN: 40, - DEL: 46, - TAB: 9, - RETURN: 13, - ESC: 27, - COMMA: 188, - PAGEUP: 33, - PAGEDOWN: 34, - BACKSPACE: 8 - }; - - // Create $ object for input element - var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass); - - var timeout; - var previousValue = ""; - var cache = $.Autocompleter.Cache(options); - var hasFocus = 0; - var lastKeyPressCode; - var config = { - mouseDownOnSelect: false - }; - var select = $.Autocompleter.Select(options, input, selectCurrent, config); - - var blockSubmit; - - // prevent form submit in opera when selecting with return key - $.browser.opera && $(input.form).bind("submit.autocomplete", function() { - if (blockSubmit) { - blockSubmit = false; - return false; - } - }); - - // only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all - $input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) { - // track last key pressed - lastKeyPressCode = event.keyCode; - switch(event.keyCode) { - - case KEY.UP: - event.preventDefault(); - if ( select.visible() ) { - select.prev(); - } else { - onChange(0, true); - } - break; - - case KEY.DOWN: - event.preventDefault(); - if ( select.visible() ) { - select.next(); - } else { - onChange(0, true); - } - break; - - case KEY.PAGEUP: - event.preventDefault(); - if ( select.visible() ) { - select.pageUp(); - } else { - onChange(0, true); - } - break; - - case KEY.PAGEDOWN: - event.preventDefault(); - if ( select.visible() ) { - select.pageDown(); - } else { - onChange(0, true); - } - break; - - // matches also semicolon - case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA: - case KEY.TAB: - case KEY.RETURN: - if( selectCurrent() ) { - // stop default to prevent a form submit, Opera needs special handling - event.preventDefault(); - blockSubmit = true; - return false; - } - break; - - case KEY.ESC: - select.hide(); - break; - - default: - clearTimeout(timeout); - timeout = setTimeout(onChange, options.delay); - break; - } - }).focus(function(){ - // track whether the field has focus, we shouldn't process any - // results if the field no longer has focus - hasFocus++; - }).blur(function() { - hasFocus = 0; - if (!config.mouseDownOnSelect) { - hideResults(); - } - }).click(function() { - // show select when clicking in a focused field - if ( hasFocus++ > 1 && !select.visible() ) { - onChange(0, true); - } - }).bind("search", function() { - // TODO why not just specifying both arguments? - var fn = (arguments.length > 1) ? arguments[1] : null; - function findValueCallback(q, data) { - var result; - if( data && data.length ) { - for (var i=0; i < data.length; i++) { - if( data[i].result.toLowerCase() == q.toLowerCase() ) { - result = data[i]; - break; - } - } - } - if( typeof fn == "function" ) fn(result); - else $input.trigger("result", result && [result.data, result.value]); - } - $.each(trimWords($input.val()), function(i, value) { - request(value, findValueCallback, findValueCallback); - }); - }).bind("flushCache", function() { - cache.flush(); - }).bind("setOptions", function() { - $.extend(options, arguments[1]); - // if we've updated the data, repopulate - if ( "data" in arguments[1] ) - cache.populate(); - }).bind("unautocomplete", function() { - select.unbind(); - $input.unbind(); - $(input.form).unbind(".autocomplete"); - }); - - - function selectCurrent() { - var selected = select.selected(); - if( !selected ) - return false; - - var v = selected.result; - previousValue = v; - - if ( options.multiple ) { - var words = trimWords($input.val()); - if ( words.length > 1 ) { - v = words.slice(0, words.length - 1).join( options.multipleSeparator ) + options.multipleSeparator + v; - } - v += options.multipleSeparator; - } - - $input.val(v); - hideResultsNow(); - $input.trigger("result", [selected.data, selected.value]); - return true; - } - - function onChange(crap, skipPrevCheck) { - if( lastKeyPressCode == KEY.DEL ) { - select.hide(); - return; - } - - var currentValue = $input.val(); - - if ( !skipPrevCheck && currentValue == previousValue ) - return; - - previousValue = currentValue; - - currentValue = lastWord(currentValue); - if ( currentValue.length >= options.minChars) { - $input.addClass(options.loadingClass); - if (!options.matchCase) - currentValue = currentValue.toLowerCase(); - request(currentValue, receiveData, hideResultsNow); - } else { - stopLoading(); - select.hide(); - } - }; - - function trimWords(value) { - if ( !value ) { - return [""]; - } - var words = value.split( options.multipleSeparator ); - var result = []; - $.each(words, function(i, value) { - if ( $.trim(value) ) - result[i] = $.trim(value); - }); - return result; - } - - function lastWord(value) { - if ( !options.multiple ) - return value; - var words = trimWords(value); - return words[words.length - 1]; - } - - // fills in the input box w/the first match (assumed to be the best match) - // q: the term entered - // sValue: the first matching result - function autoFill(q, sValue){ - // autofill in the complete box w/the first match as long as the user hasn't entered in more data - // if the last user key pressed was backspace, don't autofill - if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) { - // fill in the value (keep the case the user has typed) - $input.val($input.val() + sValue.substring(lastWord(previousValue).length)); - // select the portion of the value not typed by the user (so the next character will erase) - $.Autocompleter.Selection(input, previousValue.length, previousValue.length + sValue.length); - } - }; - - function hideResults() { - clearTimeout(timeout); - timeout = setTimeout(hideResultsNow, 200); - }; - - function hideResultsNow() { - var wasVisible = select.visible(); - select.hide(); - clearTimeout(timeout); - stopLoading(); - if (options.mustMatch) { - // call search and run callback - $input.search( - function (result){ - // if no value found, clear the input box - if( !result ) { - if (options.multiple) { - var words = trimWords($input.val()).slice(0, -1); - $input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") ); - } - else - $input.val( "" ); - } - } - ); - } - if (wasVisible) - // position cursor at end of input field - $.Autocompleter.Selection(input, input.value.length, input.value.length); - }; - - function receiveData(q, data) { - if ( data && data.length && hasFocus ) { - stopLoading(); - select.display(data, q); - autoFill(q, data[0].value); - select.show(); - } else { - hideResultsNow(); - } - }; - - function request(term, success, failure) { - if (!options.matchCase) - term = term.toLowerCase(); - var data = cache.load(term); - // recieve the cached data - if (data && data.length) { - success(term, data); - // if an AJAX url has been supplied, try loading the data now - } else if( (typeof options.url == "string") && (options.url.length > 0) ){ - - var extraParams = { - timestamp: +new Date() - }; - $.each(options.extraParams, function(key, param) { - extraParams[key] = typeof param == "function" ? param() : param; - }); - - $.ajax({ - // try to leverage ajaxQueue plugin to abort previous requests - mode: "abort", - // limit abortion to this input - port: "autocomplete" + input.name, - dataType: options.dataType, - url: options.url, - data: $.extend({ - q: lastWord(term), - limit: options.max - }, extraParams), - success: function(data) { - var parsed = options.parse && options.parse(data) || parse(data); - cache.add(term, parsed); - success(term, parsed); - } - }); - } else { - // if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match - select.emptyList(); - failure(term); - } - }; - - function parse(data) { - var parsed = []; - var rows = data.split("\n"); - for (var i=0; i < rows.length; i++) { - var row = $.trim(rows[i]); - if (row) { - row = row.split("|"); - parsed[parsed.length] = { - data: row, - value: row[0], - result: options.formatResult && options.formatResult(row, row[0]) || row[0] - }; - } - } - return parsed; - }; - - function stopLoading() { - $input.removeClass(options.loadingClass); - }; - -}; - -$.Autocompleter.defaults = { - inputClass: "ac_input", - resultsClass: "ac_results", - loadingClass: "ac_loading", - minChars: 1, - delay: 400, - matchCase: false, - matchSubset: true, - matchContains: false, - cacheLength: 10, - max: 100, - mustMatch: false, - extraParams: {}, - selectFirst: true, - formatItem: function(row) { return row[0]; }, - formatMatch: null, - autoFill: false, - width: 0, - multiple: false, - multipleSeparator: ", ", - highlight: function(value, term) { - return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); - }, - scroll: true, - scrollHeight: 180 -}; - -$.Autocompleter.Cache = function(options) { - - var data = {}; - var length = 0; - - function matchSubset(s, sub) { - if (!options.matchCase) - s = s.toLowerCase(); - var i = s.indexOf(sub); - if (options.matchContains == "word"){ - i = s.toLowerCase().search("\\b" + sub.toLowerCase()); - } - if (i == -1) return false; - return i == 0 || options.matchContains; - }; - - function add(q, value) { - if (length > options.cacheLength){ - flush(); - } - if (!data[q]){ - length++; - } - data[q] = value; - } - - function populate(){ - if( !options.data ) return false; - // track the matches - var stMatchSets = {}, - nullData = 0; - - // no url was specified, we need to adjust the cache length to make sure it fits the local data store - if( !options.url ) options.cacheLength = 1; - - // track all options for minChars = 0 - stMatchSets[""] = []; - - // loop through the array and create a lookup structure - for ( var i = 0, ol = options.data.length; i < ol; i++ ) { - var rawValue = options.data[i]; - // if rawValue is a string, make an array otherwise just reference the array - rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue; - - var value = options.formatMatch(rawValue, i+1, options.data.length); - if ( value === false ) - continue; - - var firstChar = value.charAt(0).toLowerCase(); - // if no lookup array for this character exists, look it up now - if( !stMatchSets[firstChar] ) - stMatchSets[firstChar] = []; - - // if the match is a string - var row = { - value: value, - data: rawValue, - result: options.formatResult && options.formatResult(rawValue) || value - }; - - // push the current match into the set list - stMatchSets[firstChar].push(row); - - // keep track of minChars zero items - if ( nullData++ < options.max ) { - stMatchSets[""].push(row); - } - }; - - // add the data items to the cache - $.each(stMatchSets, function(i, value) { - // increase the cache size - options.cacheLength++; - // add to the cache - add(i, value); - }); - } - - // populate any existing data - setTimeout(populate, 25); - - function flush(){ - data = {}; - length = 0; - } - - return { - flush: flush, - add: add, - populate: populate, - load: function(q) { - if (!options.cacheLength || !length) - return null; - /* - * if dealing w/local data and matchContains than we must make sure - * to loop through all the data collections looking for matches - */ - if( !options.url && options.matchContains ){ - // track all matches - var csub = []; - // loop through all the data grids for matches - for( var k in data ){ - // don't search through the stMatchSets[""] (minChars: 0) cache - // this prevents duplicates - if( k.length > 0 ){ - var c = data[k]; - $.each(c, function(i, x) { - // if we've got a match, add it to the array - if (matchSubset(x.value, q)) { - csub.push(x); - } - }); - } - } - return csub; - } else - // if the exact item exists, use it - if (data[q]){ - return data[q]; - } else - if (options.matchSubset) { - for (var i = q.length - 1; i >= options.minChars; i--) { - var c = data[q.substr(0, i)]; - if (c) { - var csub = []; - $.each(c, function(i, x) { - if (matchSubset(x.value, q)) { - csub[csub.length] = x; - } - }); - return csub; - } - } - } - return null; - } - }; -}; - -$.Autocompleter.Select = function (options, input, select, config) { - var CLASSES = { - ACTIVE: "ac_over" - }; - - var listItems, - active = -1, - data, - term = "", - needsInit = true, - element, - list; - - // Create results - function init() { - if (!needsInit) - return; - element = $("
") - .hide() - .addClass(options.resultsClass) - .css("position", "absolute") - .appendTo(document.body); - - list = $("
    ").appendTo(element).mouseover( function(event) { - if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') { - active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event)); - $(target(event)).addClass(CLASSES.ACTIVE); - } - }).click(function(event) { - $(target(event)).addClass(CLASSES.ACTIVE); - select(); - // TODO provide option to avoid setting focus again after selection? useful for cleanup-on-focus - input.focus(); - return false; - }).mousedown(function() { - config.mouseDownOnSelect = true; - }).mouseup(function() { - config.mouseDownOnSelect = false; - }); - - if( options.width > 0 ) - element.css("width", options.width); - - needsInit = false; - } - - function target(event) { - var element = event.target; - while(element && element.tagName != "LI") - element = element.parentNode; - // more fun with IE, sometimes event.target is empty, just ignore it then - if(!element) - return []; - return element; - } - - function moveSelect(step) { - listItems.slice(active, active + 1).removeClass(CLASSES.ACTIVE); - movePosition(step); - var activeItem = listItems.slice(active, active + 1).addClass(CLASSES.ACTIVE); - if(options.scroll) { - var offset = 0; - listItems.slice(0, active).each(function() { - offset += this.offsetHeight; - }); - if((offset + activeItem[0].offsetHeight - list.scrollTop()) > list[0].clientHeight) { - list.scrollTop(offset + activeItem[0].offsetHeight - list.innerHeight()); - } else if(offset < list.scrollTop()) { - list.scrollTop(offset); - } - } - }; - - function movePosition(step) { - active += step; - if (active < 0) { - active = listItems.size() - 1; - } else if (active >= listItems.size()) { - active = 0; - } - } - - function limitNumberOfItems(available) { - return options.max && options.max < available - ? options.max - : available; - } - - function fillList() { - list.empty(); - var max = limitNumberOfItems(data.length); - for (var i=0; i < max; i++) { - if (!data[i]) - continue; - var formatted = options.formatItem(data[i].data, i+1, max, data[i].value, term); - if ( formatted === false ) - continue; - var li = $("
  • ").html( options.highlight(formatted, term) ).addClass(i%2 == 0 ? "ac_even" : "ac_odd").appendTo(list)[0]; - $.data(li, "ac_data", data[i]); - } - listItems = list.find("li"); - if ( options.selectFirst ) { - listItems.slice(0, 1).addClass(CLASSES.ACTIVE); - active = 0; - } - // apply bgiframe if available - if ( $.fn.bgiframe ) - list.bgiframe(); - } - - return { - display: function(d, q) { - init(); - data = d; - term = q; - fillList(); - }, - next: function() { - moveSelect(1); - }, - prev: function() { - moveSelect(-1); - }, - pageUp: function() { - if (active != 0 && active - 8 < 0) { - moveSelect( -active ); - } else { - moveSelect(-8); - } - }, - pageDown: function() { - if (active != listItems.size() - 1 && active + 8 > listItems.size()) { - moveSelect( listItems.size() - 1 - active ); - } else { - moveSelect(8); - } - }, - hide: function() { - element && element.hide(); - listItems && listItems.removeClass(CLASSES.ACTIVE); - active = -1; - }, - visible : function() { - return element && element.is(":visible"); - }, - current: function() { - return this.visible() && (listItems.filter("." + CLASSES.ACTIVE)[0] || options.selectFirst && listItems[0]); - }, - show: function() { - var offset = $(input).offset(); - element.css({ - width: typeof options.width == "string" || options.width > 0 ? options.width : $(input).width(), - top: offset.top + input.offsetHeight, - left: offset.left - }).show(); - if(options.scroll) { - list.scrollTop(0); - list.css({ - maxHeight: options.scrollHeight, - overflow: 'auto' - }); - - if($.browser.msie && typeof document.body.style.maxHeight === "undefined") { - var listHeight = 0; - listItems.each(function() { - listHeight += this.offsetHeight; - }); - var scrollbarsVisible = listHeight > options.scrollHeight; - list.css('height', scrollbarsVisible ? options.scrollHeight : listHeight ); - if (!scrollbarsVisible) { - // IE doesn't recalculate width when scrollbar disappears - listItems.width( list.width() - parseInt(listItems.css("padding-left")) - parseInt(listItems.css("padding-right")) ); - } - } - - } - }, - selected: function() { - var selected = listItems && listItems.filter("." + CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE); - return selected && selected.length && $.data(selected[0], "ac_data"); - }, - emptyList: function (){ - list && list.empty(); - }, - unbind: function() { - element && element.remove(); - } - }; -}; - -$.Autocompleter.Selection = function(field, start, end) { - if( field.createTextRange ){ - var selRange = field.createTextRange(); - selRange.collapse(true); - selRange.moveStart("character", start); - selRange.moveEnd("character", end); - selRange.select(); - } else if( field.setSelectionRange ){ - field.setSelectionRange(start, end); - } else { - if( field.selectionStart ){ - field.selectionStart = start; - field.selectionEnd = end; - } - } - field.focus(); -}; - -})(jQuery); \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/layout.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/layout.vm deleted file mode 100644 index 6ba856fb6..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/layout.vm +++ /dev/null @@ -1,17 +0,0 @@ - - - #parse("head.vm") - - - - -
    - $content -
    - - - \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/main.css b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/main.css deleted file mode 100644 index fa221c535..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/main.css +++ /dev/null @@ -1,182 +0,0 @@ -#admin{ - text-align: right; - vertical-align: top; -} - -#head{ - width: 100%; -} -.array-field { - border: 2px solid #474747; - background: #FFE9D8; - padding: 5px; - margin: 5px; -} - -.array-field-list li { - list-style: circle; - margin-left: 20px; -} - -body { - font-family: Helvetica, Arial, sans-serif; - font-size: 10pt; -} - -a { - color: #43a4b1; -} - -.navigators { - float: left; - margin: 5px; - margin-top: 0px; - width: 185px; - padding: 5px; - position: relative; -} - -.navigators h2 { - background: #FEC293; - border: 1px solid #ce9d77; - padding: 5px; -} - -.navigators ul { - list-style: none; - margin: 0; - margin-bottom: 5px; - margin-top: 5px; - padding-left: 10px; -} - -.navigators ul li { - color: #999; - padding: 2px; -} - - - -.facet-field { - font-weight: bold; -} - -.highlight { - color: white; - background-color: gray; - border: 1px black solid; -} - -.highlight-box { - margin-left: 15px; -} - -.field-name { - font-weight: bold; -} - -.highlighted-facet-field { - background: white; -} - -.constraints { - margin-top: 10px; -} - -#query-form{ - width: 80%; -} - - - -.query-box, .constraints { - padding: 5px; - margin: 5px; - font-weight: normal; - font-size: 24px; - letter-spacing: 0.08em; -} - -.query-box #q { - margin-left: 8px; - width: 60%; - height: 50px; - border: 1px solid #999; - font-size: 1em; - padding: 0.4em; -} - -.query-box { - -} - -.query-boost { - - top: 10px; - left: 50px; - position: relative; - font-size: 0.8em; -} - -.query-box .inputs{ - left: 180px; - position: relative; - -} - -#logo { - margin: 10px; - border-style: none; -} - -.pagination { - padding-left: 33%; - background: #eee; - margin: 5px; - margin-left: 210px; - padding-top: 5px; - padding-bottom: 5px; -} - -.result-document { - border: 1px solid #999; - padding: 5px; - margin: 5px; - margin-left: 210px; - margin-bottom: 15px; -} - -.result-document div{ - padding: 5px; -} - -.result-title{ - width:60%; -} - -.mlt{ - -} - -.map{ - float: right; - position: relative; - top: -25px; -} - -.result-document:nth-child(2n+1) { - background-color: #eee; -} - - -.selected-facet-field { - font-weight: bold; -} - -li.show { - list-style: disc; -} - -.group-value{ - font-weight: bold; -} \ No newline at end of file diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/query.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/query.vm deleted file mode 100644 index 1948d28ff..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/query.vm +++ /dev/null @@ -1,54 +0,0 @@ - - -
    -
    -
    - Find: -
    -
    - - #if($request.params.get('debugQuery')) - - #end - #if($annotate == true) - - #end - #foreach($fq in $request.params.getParams('fq')) - #if ($fq != "{!bbox}") - - #end - #end -
    - #foreach($fq in $params.getParams('fq')) - #set($previous_fq_count=$velocityCount - 1) - #if($fq != '') - > $fq - #end - #end -
    - #if($request.params.get('debugQuery')) - toggle parsed query - 
    $response.response.debug.parsedquery
    - #end - #set($queryOpts = $request.params.get("queryOpts")) - #if($queryOpts && $queryOpts != "") - - #end - - -
diff --git a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/suggest.vm b/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/suggest.vm deleted file mode 100644 index 0f554ce04..000000000 --- a/docker/typo3-solr/3.1/solr/typo3cores/conf/velocity/suggest.vm +++ /dev/null @@ -1,3 +0,0 @@ -#foreach($t in $response.response.terms.title) -$t.key -#end \ No newline at end of file diff --git a/docker/typo3-solr/4.0 b/docker/typo3-solr/4.0 deleted file mode 120000 index 6e6366051..000000000 --- a/docker/typo3-solr/4.0 +++ /dev/null @@ -1 +0,0 @@ -5.0 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile deleted file mode 100644 index eb4a67e9d..000000000 --- a/docker/typo3-solr/5.0/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:5.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM guywithnose/solr:4.10.4 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - -COPY ./solr/ /tmp/solr - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -WORKDIR / - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && /usr/local/bin/generate-dockerimage-info \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ \ - && docker-image-cleanup - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 deleted file mode 100644 index 8b4afe347..000000000 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.guywithnose(release="1.3.0") }} diff --git a/docker/typo3-solr/5.0/solr/solr.xml b/docker/typo3-solr/5.0/solr/solr.xml deleted file mode 100644 index bdcdfd479..000000000 --- a/docker/typo3-solr/5.0/solr/solr.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/admin-extra.html b/docker/typo3-solr/5.0/solr/typo3cores/conf/admin-extra.html deleted file mode 100644 index b68131ad9..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/admin-extra.html +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json deleted file mode 100644 index 580df1738..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/_schema_analysis_stopwords_arabic.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:57.000Z", - "managedList": [ - "من", - "ومن", - "منها", - "منه", - "في", - "وفي", - "فيها", - "فيه", - "و", - "ف", - "ثم", - "او", - "أو", - "ب", - "بها", - "به", - "ا", - "أ", - "اى", - "اي", - "أي", - "أى", - "لا", - "ولا", - "الا", - "ألا", - "إلا", - "لكن", - "ما", - "وما", - "كما", - "فما", - "عن", - "مع", - "اذا", - "إذا", - "ان", - "أن", - "إن", - "انها", - "أنها", - "إنها", - "انه", - "أنه", - "إنه", - "بان", - "بأن", - "فان", - "فأن", - "وان", - "وأن", - "وإن", - "التى", - "التي", - "الذى", - "الذي", - "الذين", - "الى", - "الي", - "إلى", - "إلي", - "على", - "عليها", - "عليه", - "اما", - "أما", - "إما", - "ايضا", - "أيضا", - "كل", - "وكل", - "لم", - "ولم", - "لن", - "ولن", - "هى", - "هي", - "هو", - "وهى", - "وهي", - "وهو", - "فهى", - "فهي", - "فهو", - "انت", - "أنت", - "لك", - "لها", - "له", - "هذه", - "هذا", - "تلك", - "ذلك", - "هناك", - "كانت", - "كان", - "يكون", - "تكون", - "وكانت", - "وكان", - "غير", - "بعض", - "قد", - "نحو", - "بين", - "بينما", - "منذ", - "ضمن", - "حيث", - "الان", - "الآن", - "خلال", - "بعد", - "قبل", - "حتى", - "عند", - "عندما", - "لدى", - "جميع" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/schema.xml deleted file mode 100644 index 508437d4a..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/schema.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/arabic/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json deleted file mode 100644 index 413654a72..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/_schema_analysis_stopwords_armenian.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "այդ", - "այլ", - "այն", - "այս", - "դու", - "դուք", - "եմ", - "են", - "ենք", - "ես", - "եք", - "է", - "էի", - "էին", - "էինք", - "էիր", - "էիք", - "էր", - "ըստ", - "թ", - "ի", - "ին", - "իսկ", - "իր", - "կամ", - "համար", - "հետ", - "հետո", - "մենք", - "մեջ", - "մի", - "ն", - "նա", - "նաև", - "նրա", - "նրանք", - "որ", - "որը", - "որոնք", - "որպես", - "ու", - "ում", - "պիտի", - "վրա", - "և" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/schema.xml deleted file mode 100644 index 050f85450..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/schema.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/armenian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json deleted file mode 100644 index b440eaef8..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/_schema_analysis_stopwords_basque.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "al", - "anitz", - "arabera", - "asko", - "baina", - "bat", - "batean", - "batek", - "bati", - "batzuei", - "batzuek", - "batzuetan", - "batzuk", - "bera", - "beraiek", - "berau", - "berauek", - "bere", - "berori", - "beroriek", - "beste", - "bezala", - "da", - "dago", - "dira", - "ditu", - "du", - "dute", - "edo", - "egin", - "ere", - "eta", - "eurak", - "ez", - "gainera", - "gu", - "gutxi", - "guzti", - "haiei", - "haiek", - "haietan", - "hainbeste", - "hala", - "han", - "handik", - "hango", - "hara", - "hari", - "hark", - "hartan", - "hau", - "hauei", - "hauek", - "hauetan", - "hemen", - "hemendik", - "hemengo", - "hi", - "hona", - "honek", - "honela", - "honetan", - "honi", - "hor", - "hori", - "horiei", - "horiek", - "horietan", - "horko", - "horra", - "horrek", - "horrela", - "horretan", - "horri", - "hortik", - "hura", - "izan", - "ni", - "noiz", - "nola", - "non", - "nondik", - "nongo", - "nor", - "nora", - "ze", - "zein", - "zen", - "zenbait", - "zenbat", - "zer", - "zergatik", - "ziren", - "zituen", - "zu", - "zuek", - "zuen", - "zuten" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/schema.xml deleted file mode 100644 index c26ffc0a4..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/basque/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json deleted file mode 100644 index b30edf7a9..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/_schema_analysis_stopwords_brazilian_portuguese.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "ainda", - "alem", - "ambas", - "ambos", - "antes", - "ao", - "aonde", - "aos", - "apos", - "aquele", - "aqueles", - "as", - "assim", - "com", - "como", - "contra", - "contudo", - "cuja", - "cujas", - "cujo", - "cujos", - "da", - "das", - "de", - "dela", - "dele", - "deles", - "demais", - "depois", - "desde", - "desta", - "deste", - "dispoe", - "dispoem", - "diversa", - "diversas", - "diversos", - "do", - "dos", - "durante", - "e", - "ela", - "elas", - "ele", - "eles", - "em", - "entao", - "entre", - "essa", - "essas", - "esse", - "esses", - "esta", - "estas", - "este", - "estes", - "ha", - "isso", - "isto", - "logo", - "mais", - "mas", - "mediante", - "menos", - "mesma", - "mesmas", - "mesmo", - "mesmos", - "na", - "nas", - "nao", - "nas", - "nem", - "nesse", - "neste", - "nos", - "o", - "os", - "ou", - "outra", - "outras", - "outro", - "outros", - "pelas", - "pelas", - "pelo", - "pelos", - "perante", - "pois", - "por", - "porque", - "portanto", - "proprio", - "propios", - "quais", - "qual", - "qualquer", - "quando", - "quanto", - "que", - "quem", - "quer", - "se", - "seja", - "sem", - "sendo", - "seu", - "seus", - "sob", - "sobre", - "sua", - "suas", - "tal", - "tambem", - "teu", - "teus", - "toda", - "todas", - "todo", - "todos", - "tua", - "tuas", - "tudo", - "um", - "uma", - "umas", - "uns" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/schema.xml deleted file mode 100644 index 157191d2b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/schema.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/brazilian_portuguese/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json deleted file mode 100644 index 52bd7cb5c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/_schema_analysis_stopwords_bulgarian.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "а", - "аз", - "ако", - "ала", - "бе", - "без", - "беше", - "би", - "бил", - "била", - "били", - "било", - "близо", - "бъдат", - "бъде", - "бяха", - "в", - "вас", - "ваш", - "ваша", - "вероятно", - "вече", - "взема", - "ви", - "вие", - "винаги", - "все", - "всеки", - "всички", - "всичко", - "всяка", - "във", - "въпреки", - "върху", - "г", - "ги", - "главно", - "го", - "д", - "да", - "дали", - "до", - "докато", - "докога", - "дори", - "досега", - "доста", - "е", - "едва", - "един", - "ето", - "за", - "зад", - "заедно", - "заради", - "засега", - "затова", - "защо", - "защото", - "и", - "из", - "или", - "им", - "има", - "имат", - "иска", - "й", - "каза", - "как", - "каква", - "какво", - "както", - "какъв", - "като", - "кога", - "когато", - "което", - "които", - "кой", - "който", - "колко", - "която", - "къде", - "където", - "към", - "ли", - "м", - "ме", - "между", - "мен", - "ми", - "мнозина", - "мога", - "могат", - "може", - "моля", - "момента", - "му", - "н", - "на", - "над", - "назад", - "най", - "направи", - "напред", - "например", - "нас", - "не", - "него", - "нея", - "ни", - "ние", - "никой", - "нито", - "но", - "някои", - "някой", - "няма", - "обаче", - "около", - "освен", - "особено", - "от", - "отгоре", - "отново", - "още", - "пак", - "по", - "повече", - "повечето", - "под", - "поне", - "поради", - "после", - "почти", - "прави", - "пред", - "преди", - "през", - "при", - "пък", - "първо", - "с", - "са", - "само", - "се", - "сега", - "си", - "скоро", - "след", - "сме", - "според", - "сред", - "срещу", - "сте", - "съм", - "със", - "също", - "т", - "тази", - "така", - "такива", - "такъв", - "там", - "твой", - "те", - "тези", - "ти", - "тн", - "то", - "това", - "тогава", - "този", - "той", - "толкова", - "точно", - "трябва", - "тук", - "тъй", - "тя", - "тях", - "у", - "харесва", - "ч", - "че", - "често", - "чрез", - "ще", - "щом", - "я" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/schema.xml deleted file mode 100644 index 2a94115a5..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/schema.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/bulgarian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/_schema_analysis_stopwords_burmese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/readme.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/schema.xml deleted file mode 100644 index f4e8299c9..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/burmese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json deleted file mode 100644 index 45bf23de8..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/_schema_analysis_stopwords_catalan.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "abans", - "ací", - "ah", - "així", - "això", - "al", - "als", - "aleshores", - "algun", - "alguna", - "algunes", - "alguns", - "alhora", - "allà", - "allí", - "allò", - "altra", - "altre", - "altres", - "amb", - "ambdós", - "ambdues", - "apa", - "aquell", - "aquella", - "aquelles", - "aquells", - "aquest", - "aquesta", - "aquestes", - "aquests", - "aquí", - "baix", - "cada", - "cadascú", - "cadascuna", - "cadascunes", - "cadascuns", - "com", - "contra", - "d'un", - "d'una", - "d'unes", - "d'uns", - "dalt", - "de", - "del", - "dels", - "des", - "després", - "dins", - "dintre", - "donat", - "doncs", - "durant", - "e", - "eh", - "el", - "els", - "em", - "en", - "encara", - "ens", - "entre", - "érem", - "eren", - "éreu", - "es", - "és", - "esta", - "està", - "estàvem", - "estaven", - "estàveu", - "esteu", - "et", - "etc", - "ets", - "fins", - "fora", - "gairebé", - "ha", - "han", - "has", - "havia", - "he", - "hem", - "heu", - "hi", - "ho", - "i", - "igual", - "iguals", - "ja", - "l'hi", - "la", - "les", - "li", - "li'n", - "llavors", - "m'he", - "ma", - "mal", - "malgrat", - "mateix", - "mateixa", - "mateixes", - "mateixos", - "me", - "mentre", - "més", - "meu", - "meus", - "meva", - "meves", - "molt", - "molta", - "moltes", - "molts", - "mon", - "mons", - "n'he", - "n'hi", - "ne", - "ni", - "no", - "nogensmenys", - "només", - "nosaltres", - "nostra", - "nostre", - "nostres", - "o", - "oh", - "oi", - "on", - "pas", - "pel", - "pels", - "per", - "però", - "perquè", - "poc", - "poca", - "pocs", - "poques", - "potser", - "propi", - "qual", - "quals", - "quan", - "quant", - "que", - "què", - "quelcom", - "qui", - "quin", - "quina", - "quines", - "quins", - "s'ha", - "s'han", - "sa", - "semblant", - "semblants", - "ses", - "seu", - "seus", - "seva", - "seva", - "seves", - "si", - "sobre", - "sobretot", - "sóc", - "solament", - "sols", - "son", - "són", - "sons", - "sota", - "sou", - "t'ha", - "t'han", - "t'he", - "ta", - "tal", - "també", - "tampoc", - "tan", - "tant", - "tanta", - "tantes", - "teu", - "teus", - "teva", - "teves", - "ton", - "tons", - "tot", - "tota", - "totes", - "tots", - "un", - "una", - "unes", - "uns", - "us", - "va", - "vaig", - "vam", - "van", - "vas", - "veu", - "vosaltres", - "vostra", - "vostre", - "vostres" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/schema.xml deleted file mode 100644 index af4f31bbd..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/schema.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/catalan/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/_schema_analysis_stopwords_chinese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/schema.xml deleted file mode 100644 index 0e6c85106..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/chinese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/currency.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/currency.xml deleted file mode 100644 index 4d77aebd0..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/currency.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json deleted file mode 100644 index e08e8ab2d..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/_schema_analysis_stopwords_czech.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "s", - "k", - "o", - "i", - "u", - "v", - "z", - "dnes", - "cz", - "tímto", - "budeš", - "budem", - "byli", - "jseš", - "můj", - "svým", - "ta", - "tomto", - "tohle", - "tuto", - "tyto", - "jej", - "zda", - "proč", - "máte", - "tato", - "kam", - "tohoto", - "kdo", - "kteří", - "mi", - "nám", - "tom", - "tomuto", - "mít", - "nic", - "proto", - "kterou", - "byla", - "toho", - "protože", - "asi", - "ho", - "naši", - "napište", - "re", - "což", - "tím", - "takže", - "svých", - "její", - "svými", - "jste", - "aj", - "tu", - "tedy", - "teto", - "bylo", - "kde", - "ke", - "pravé", - "ji", - "nad", - "nejsou", - "či", - "pod", - "téma", - "mezi", - "přes", - "ty", - "pak", - "vám", - "ani", - "když", - "však", - "neg", - "jsem", - "tento", - "článku", - "články", - "aby", - "jsme", - "před", - "pta", - "jejich", - "byl", - "ještě", - "až", - "bez", - "také", - "pouze", - "první", - "vaše", - "která", - "nás", - "nový", - "tipy", - "pokud", - "může", - "strana", - "jeho", - "své", - "jiné", - "zprávy", - "nové", - "není", - "vás", - "jen", - "podle", - "zde", - "už", - "být", - "více", - "bude", - "již", - "než", - "který", - "by", - "které", - "co", - "nebo", - "ten", - "tak", - "má", - "při", - "od", - "po", - "jsou", - "jak", - "další", - "ale", - "si", - "se", - "ve", - "to", - "jako", - "za", - "zpět", - "ze", - "do", - "pro", - "je", - "na", - "atd", - "atp", - "jakmile", - "přičemž", - "já", - "on", - "ona", - "ono", - "oni", - "ony", - "my", - "vy", - "jí", - "ji", - "mě", - "mne", - "jemu", - "tomu", - "těm", - "těmu", - "němu", - "němuž", - "jehož", - "jíž", - "jelikož", - "jež", - "jakož", - "načež" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/schema.xml deleted file mode 100644 index 3aef4ee78..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/czech/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json deleted file mode 100644 index 9491bd7b5..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/_schema_analysis_stopwords_danish.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "og", - "i", - "jeg", - "det", - "at", - "en", - "den", - "til", - "er", - "som", - "på", - "de", - "med", - "han", - "af", - "for", - "ikke", - "der", - "var", - "mig", - "sig", - "men", - "et", - "har", - "om", - "vi", - "min", - "havde", - "ham", - "hun", - "nu", - "over", - "da", - "fra", - "du", - "ud", - "sin", - "dem", - "os", - "op", - "man", - "hans", - "hvor", - "eller", - "hvad", - "skal", - "selv", - "her", - "alle", - "vil", - "blev", - "kunne", - "ind", - "når", - "være", - "dog", - "noget", - "ville", - "jo", - "deres", - "efter", - "ned", - "skulle", - "denne", - "end", - "dette", - "mit", - "også", - "under", - "have", - "dig", - "anden", - "hende", - "mine", - "alt", - "meget", - "sit", - "sine", - "vor", - "mod", - "disse", - "hvis", - "din", - "nogle", - "hos", - "blive", - "mange", - "ad", - "bliver", - "hendes", - "været", - "thi", - "jer", - "sådan" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/protwords.txt deleted file mode 100644 index c0be26e39..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/protwords.txt +++ /dev/null @@ -1,17 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/schema.xml deleted file mode 100644 index 4667e9c15..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/schema.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/danish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json deleted file mode 100644 index 9a1448309..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/_schema_analysis_stopwords_dutch.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "en", - "van", - "ik", - "te", - "dat", - "die", - "in", - "een", - "hij", - "het", - "niet", - "zijn", - "is", - "was", - "op", - "aan", - "met", - "als", - "voor", - "had", - "er", - "maar", - "om", - "hem", - "dan", - "zou", - "of", - "wat", - "mijn", - "men", - "dit", - "zo", - "door", - "over", - "ze", - "zich", - "bij", - "ook", - "tot", - "je", - "mij", - "uit", - "der", - "daar", - "haar", - "naar", - "heb", - "hoe", - "heeft", - "hebben", - "deze", - "u", - "want", - "nog", - "zal", - "me", - "zij", - "nu", - "ge", - "geen", - "omdat", - "iets", - "worden", - "toch", - "al", - "waren", - "veel", - "meer", - "doen", - "toen", - "moet", - "ben", - "zonder", - "kan", - "hun", - "dus", - "alles", - "onder", - "ja", - "eens", - "hier", - "wie", - "werd", - "altijd", - "doch", - "wordt", - "wezen", - "kunnen", - "ons", - "zelf", - "tegen", - "na", - "reeds", - "wil", - "kon", - "niets", - "uw", - "iemand", - "geweest", - "andere" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/schema.xml deleted file mode 100644 index b1a5d0250..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/schema.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/dutch/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/elevate.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/elevate.xml deleted file mode 100644 index 7630ebe20..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json deleted file mode 100644 index ffc7fbdc9..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/_schema_analysis_stopwords_english.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "i", - "me", - "my", - "myself", - "we", - "us", - "our", - "ours", - "ourselves", - "you", - "your", - "yours", - "yourself", - "yourselves", - "he", - "him", - "his", - "himself", - "she", - "her", - "hers", - "herself", - "it", - "its", - "itself", - "they", - "them", - "their", - "theirs", - "themselves", - "what", - "which", - "who", - "whom", - "this", - "that", - "these", - "those", - "am", - "is", - "are", - "was", - "were", - "be", - "been", - "being", - "have", - "has", - "had", - "having", - "do", - "does", - "did", - "doing", - "would", - "should", - "could", - "ought", - "i'm", - "you're", - "he's", - "she's", - "it's", - "we're", - "they're", - "i've", - "you've", - "we've", - "they've", - "i'd", - "you'd", - "he'd", - "she'd", - "we'd", - "they'd", - "i'll", - "you'll", - "he'll", - "she'll", - "we'll", - "they'll", - "isn't", - "aren't", - "wasn't", - "weren't", - "hasn't", - "haven't", - "hadn't", - "doesn't", - "don't", - "didn't", - "won't", - "wouldn't", - "shan't", - "shouldn't", - "can't", - "cannot", - "couldn't", - "mustn't", - "let's", - "that's", - "who's", - "what's", - "here's", - "there's", - "when's", - "where's", - "why's", - "how's", - "an", - "the", - "and", - "but", - "if", - "or", - "because", - "as", - "until", - "while", - "of", - "at", - "by", - "for", - "with", - "about", - "against", - "between", - "into", - "through", - "during", - "before", - "after", - "above", - "below", - "to", - "from", - "up", - "down", - "in", - "out", - "on", - "off", - "over", - "under", - "again", - "further", - "then", - "once", - "here", - "there", - "when", - "where", - "why", - "how", - "all", - "any", - "both", - "each", - "few", - "more", - "most", - "other", - "some", - "such", - "no", - "nor", - "not", - "only", - "own", - "same", - "so", - "than", - "too", - "very" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/english/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/english/schema.xml deleted file mode 100644 index 421a32c79..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/english/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/english/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json deleted file mode 100644 index 8705e10ea..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/_schema_analysis_stopwords_finnish.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "olla", - "olen", - "olet", - "on", - "olemme", - "olette", - "ovat", - "ole", - "oli", - "olisi", - "olisit", - "olisin", - "olisimme", - "olisitte", - "olisivat", - "olit", - "olin", - "olimme", - "olitte", - "olivat", - "ollut", - "olleet", - "en", - "et", - "ei", - "emme", - "ette", - "eivät", - "minä", - "minun", - "minut", - "minua", - "minussa", - "minusta", - "minuun", - "minulla", - "minulta", - "minulle", - "sinä", - "sinun", - "sinut", - "sinua", - "sinussa", - "sinusta", - "sinuun", - "sinulla", - "sinulta", - "sinulle", - "hän", - "hänen", - "hänet", - "häntä", - "hänessä", - "hänestä", - "häneen", - "hänellä", - "häneltä", - "hänelle", - "me", - "meidän", - "meidät", - "meitä", - "meissä", - "meistä", - "meihin", - "meillä", - "meiltä", - "meille", - "te", - "teidän", - "teidät", - "teitä", - "teissä", - "teistä", - "teihin", - "teillä", - "teiltä", - "teille", - "he", - "heidän", - "heidät", - "heitä", - "heissä", - "heistä", - "heihin", - "heillä", - "heiltä", - "heille", - "tämä", - "tämän", - "tätä", - "tässä", - "tästä", - "tähän", - "tallä", - "tältä", - "tälle", - "tänä", - "täksi", - "tuo", - "tuon", - "tuotä", - "tuossa", - "tuosta", - "tuohon", - "tuolla", - "tuolta", - "tuolle", - "tuona", - "tuoksi", - "se", - "sen", - "sitä", - "siinä", - "siitä", - "siihen", - "sillä", - "siltä", - "sille", - "sinä", - "siksi", - "nämä", - "näiden", - "näitä", - "näissä", - "näistä", - "näihin", - "näillä", - "näiltä", - "näille", - "näinä", - "näiksi", - "nuo", - "noiden", - "noita", - "noissa", - "noista", - "noihin", - "noilla", - "noilta", - "noille", - "noina", - "noiksi", - "ne", - "niiden", - "niitä", - "niissä", - "niistä", - "niihin", - "niillä", - "niiltä", - "niille", - "niinä", - "niiksi", - "kuka", - "kenen", - "kenet", - "ketä", - "kenessä", - "kenestä", - "keneen", - "kenellä", - "keneltä", - "kenelle", - "kenenä", - "keneksi", - "ketkä", - "keiden", - "ketkä", - "keitä", - "keissä", - "keistä", - "keihin", - "keillä", - "keiltä", - "keille", - "keinä", - "keiksi", - "mikä", - "minkä", - "minkä", - "mitä", - "missä", - "mistä", - "mihin", - "millä", - "miltä", - "mille", - "minä", - "miksi", - "mitkä", - "joka", - "jonka", - "jota", - "jossa", - "josta", - "johon", - "jolla", - "jolta", - "jolle", - "jona", - "joksi", - "jotka", - "joiden", - "joita", - "joissa", - "joista", - "joihin", - "joilla", - "joilta", - "joille", - "joina", - "joiksi", - "että", - "ja", - "jos", - "koska", - "kuin", - "mutta", - "niin", - "sekä", - "sillä", - "tai", - "vaan", - "vai", - "vaikka", - "kanssa", - "mukaan", - "noin", - "poikki", - "yli", - "kun", - "niin", - "nyt", - "itse" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/schema.xml deleted file mode 100644 index 8bf5f5046..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/schema.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/finnish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json deleted file mode 100644 index 849e58721..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/_schema_analysis_stopwords_french.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "au", - "aux", - "avec", - "ce", - "ces", - "dans", - "de", - "des", - "du", - "elle", - "en", - "et", - "eux", - "il", - "je", - "la", - "le", - "leur", - "lui", - "ma", - "mais", - "me", - "même", - "mes", - "moi", - "mon", - "ne", - "nos", - "notre", - "nous", - "on", - "ou", - "par", - "pas", - "pour", - "qu", - "que", - "qui", - "sa", - "se", - "ses", - "son", - "sur", - "ta", - "te", - "tes", - "toi", - "ton", - "tu", - "un", - "une", - "vos", - "votre", - "vous", - "c", - "d", - "j", - "l", - "à", - "m", - "n", - "s", - "t", - "y", - "été", - "étée", - "étées", - "étés", - "étant", - "suis", - "es", - "est", - "sommes", - "êtes", - "sont", - "serai", - "seras", - "sera", - "serons", - "serez", - "seront", - "serais", - "serait", - "serions", - "seriez", - "seraient", - "étais", - "était", - "étions", - "étiez", - "étaient", - "fus", - "fut", - "fûmes", - "fûtes", - "furent", - "sois", - "soit", - "soyons", - "soyez", - "soient", - "fusse", - "fusses", - "fût", - "fussions", - "fussiez", - "fussent", - "ayant", - "eu", - "eue", - "eues", - "eus", - "ai", - "as", - "avons", - "avez", - "ont", - "aurai", - "auras", - "aura", - "aurons", - "aurez", - "auront", - "aurais", - "aurait", - "aurions", - "auriez", - "auraient", - "avais", - "avait", - "avions", - "aviez", - "avaient", - "eut", - "eûmes", - "eûtes", - "eurent", - "aie", - "aies", - "ait", - "ayons", - "ayez", - "aient", - "eusse", - "eusses", - "eût", - "eussions", - "eussiez", - "eussent", - "ceci", - "celà", - "cet", - "cette", - "ici", - "ils", - "les", - "leurs", - "quel", - "quels", - "quelle", - "quelles", - "sans", - "soi" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/french/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/french/schema.xml deleted file mode 100644 index 3fbc37242..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/french/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/french/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json deleted file mode 100644 index 62cbf4114..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/_schema_analysis_stopwords_galician.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "aínda", - "alí", - "aquel", - "aquela", - "aquelas", - "aqueles", - "aquilo", - "aquí", - "ao", - "aos", - "as", - "así", - "á", - "ben", - "cando", - "che", - "co", - "coa", - "comigo", - "con", - "connosco", - "contigo", - "convosco", - "coas", - "cos", - "cun", - "cuns", - "cunha", - "cunhas", - "da", - "dalgunha", - "dalgunhas", - "dalgún", - "dalgúns", - "das", - "de", - "del", - "dela", - "delas", - "deles", - "desde", - "deste", - "do", - "dos", - "dun", - "duns", - "dunha", - "dunhas", - "e", - "el", - "ela", - "elas", - "eles", - "en", - "era", - "eran", - "esa", - "esas", - "ese", - "eses", - "esta", - "estar", - "estaba", - "está", - "están", - "este", - "estes", - "estiven", - "estou", - "eu", - "é", - "facer", - "foi", - "foron", - "fun", - "había", - "hai", - "iso", - "isto", - "la", - "las", - "lle", - "lles", - "lo", - "los", - "mais", - "me", - "meu", - "meus", - "min", - "miña", - "miñas", - "moi", - "na", - "nas", - "neste", - "nin", - "no", - "non", - "nos", - "nosa", - "nosas", - "noso", - "nosos", - "nós", - "nun", - "nunha", - "nuns", - "nunhas", - "o", - "os", - "ou", - "ó", - "ós", - "para", - "pero", - "pode", - "pois", - "pola", - "polas", - "polo", - "polos", - "por", - "que", - "se", - "senón", - "ser", - "seu", - "seus", - "sexa", - "sido", - "sobre", - "súa", - "súas", - "tamén", - "tan", - "te", - "ten", - "teñen", - "teño", - "ter", - "teu", - "teus", - "ti", - "tido", - "tiña", - "tiven", - "túa", - "túas", - "un", - "unha", - "unhas", - "uns", - "vos", - "vosa", - "vosas", - "voso", - "vosos", - "vós" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/schema.xml deleted file mode 100644 index 698ba4072..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/schema.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/galician/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_fields.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_fields.xml deleted file mode 100644 index fc079132c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_fields.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_types.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_types.xml deleted file mode 100644 index 0776326f0..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/general_schema_types.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/_schema_analysis_stopwords_generic.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/schema.xml deleted file mode 100644 index b998b2e9d..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/generic/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json deleted file mode 100644 index 1cffba337..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/_schema_analysis_stopwords_german.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "aber", - "alle", - "allem", - "allen", - "aller", - "alles", - "als", - "also", - "am", - "an", - "ander", - "andere", - "anderem", - "anderen", - "anderer", - "anderes", - "anderm", - "andern", - "anderr", - "anders", - "auch", - "auf", - "aus", - "bei", - "bin", - "bis", - "bist", - "da", - "damit", - "dann", - "der", - "den", - "des", - "dem", - "die", - "das", - "daß", - "derselbe", - "derselben", - "denselben", - "desselben", - "demselben", - "dieselbe", - "dieselben", - "dasselbe", - "dazu", - "dein", - "deine", - "deinem", - "deinen", - "deiner", - "deines", - "denn", - "derer", - "dessen", - "dich", - "dir", - "du", - "dies", - "diese", - "diesem", - "diesen", - "dieser", - "dieses", - "doch", - "dort", - "durch", - "ein", - "eine", - "einem", - "einen", - "einer", - "eines", - "einig", - "einige", - "einigem", - "einigen", - "einiger", - "einiges", - "einmal", - "er", - "ihn", - "ihm", - "es", - "etwas", - "euer", - "eure", - "eurem", - "euren", - "eurer", - "eures", - "für", - "gegen", - "gewesen", - "hab", - "habe", - "haben", - "hat", - "hatte", - "hatten", - "hier", - "hin", - "hinter", - "ich", - "mich", - "mir", - "ihr", - "ihre", - "ihrem", - "ihren", - "ihrer", - "ihres", - "euch", - "im", - "in", - "indem", - "ins", - "ist", - "jede", - "jedem", - "jeden", - "jeder", - "jedes", - "jene", - "jenem", - "jenen", - "jener", - "jenes", - "jetzt", - "kann", - "kein", - "keine", - "keinem", - "keinen", - "keiner", - "keines", - "können", - "könnte", - "machen", - "man", - "manche", - "manchem", - "manchen", - "mancher", - "manches", - "mein", - "meine", - "meinem", - "meinen", - "meiner", - "meines", - "mit", - "muss", - "musste", - "nach", - "nicht", - "nichts", - "noch", - "nun", - "nur", - "ob", - "oder", - "ohne", - "sehr", - "sein", - "seine", - "seinem", - "seinen", - "seiner", - "seines", - "selbst", - "sich", - "sie", - "ihnen", - "sind", - "so", - "solche", - "solchem", - "solchen", - "solcher", - "solches", - "soll", - "sollte", - "sondern", - "sonst", - "über", - "um", - "und", - "uns", - "unse", - "unsem", - "unsen", - "unser", - "unses", - "unter", - "viel", - "vom", - "von", - "vor", - "während", - "war", - "waren", - "warst", - "was", - "weg", - "weil", - "weiter", - "welche", - "welchem", - "welchen", - "welcher", - "welches", - "wenn", - "werde", - "werden", - "wie", - "wieder", - "will", - "wir", - "wird", - "wirst", - "wo", - "wollen", - "wollte", - "würde", - "würden", - "zu", - "zum", - "zur", - "zwar", - "zwischen" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/german-common-nouns.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/german/german-common-nouns.txt deleted file mode 100644 index aced66a52..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/german-common-nouns.txt +++ /dev/null @@ -1,3870 +0,0 @@ -ähren -ältesten -ämter -änderungs -äquatorial -äquivalenz -ärmel -ärzte -abänderungs -abarbeitungs -abbau -abbildungs -abbinde -abblas -abblend -abbrand -abbrems -abbrenn -abbruch -abbuchungs -abdampf -abdeck -abdicht -abdichtungs -abdominal -abdreh -abdruck -abduktions -abduktoren -abdunkelungs -abduzens -abend -abendmahl -abendmahls -abenteuer -abenteurer -abfahrt -abfahrts -abfall -abfang -abfertigungs -abfindungs -abflug -abfluss -abfrage -abführ -abfüll -abfuhr -abgabe -abgaben -abgangs -abgas -abgeordneten -abgeschlossenheits -abgrenzungs -abhänge -abhängigkeits -abhäute -abhebe -abhitze -abhör -abhol -abisolier -abitur -abiturienten -abkant -abklatsch -abkling -abkühlungs -abkürzungs -ablade -abladungs -ablage -ablagerungs -ablass -ablauf -ablege -ablehnungs -ableit -ableitungs -ablenk -ablenkungs -ablese -ablieferungs -ablöse -ablösungs -abluft -abmagerungs -abmelde -abnahme -abnehmer -abnutzungs -abonnement -abonnements -abonnenten -abort -abpack -abrechnungs -abreiss -abreise -abricht -abrieb -abriss -abroll -abrüstungs -abruf -absatz -absaug -abschalt -abschiebe -abschieds -abschirm -abschlags -abschlepp -abschluss -abschmier -abschmink -abschneid -abschneide -abschnitts -abschott -abschottungs -abschreck -abschreckungs -abschreibe -abschreibungs -abschuss -abschwächungs -abseits -absetz -absetzungs -absicherungs -absichts -absolut -absonderungs -absorbier -absorptions -abspann -absperr -abspiel -absprengungs -absprung -abspül -abstammungs -abstand -abstands -abstell -abstiegs -abstimm -abstimmungs -abstinenz -abstossungs -abstrahl -abstraktions -absturz -abszissen -abtast -abteil -abteilungs -abtreibungs -abtrenn -abtretungs -abtropf -abwägungs -abwärts -abwanderungs -abwasch -abwasser -abwehr -abwertungs -abwesenheits -abwickel -abwicklungs -abwrack -abwurf -abzähl -abzahlungs -abzeichen -abzieh -abzugs -abzweig -achilles -achs -achsel -achsen -acht -achter -achtungs -acker -acryl -action -adams -adaptations -adapter -adaptions -addier -additions -adduktions -adel -adels -ader -adhäsions -adler -administrations -admiral -admirals -adoleszenten -adoptions -adoptiv -adress -adressen -adsorptions -advents -affekt -affen -afrika -after -agenten -agentur -agglutinations -aggregations -aggressions -agitations -agrar -ahnen -ahorn -akademie -akademiker -akkommodations -akkord -akkreditierungs -akkreditiv -akku -akkumulator -akquisitions -akrobaten -akt -akten -aktien -aktionärs -aktions -aktiv -aktivierungs -aktivisten -aktivitäts -aktualisierungs -akupunktur -akustik -akzent -akzept -akzeptanz -akzidenz -alarm -alarmierungs -algerien -alibi -alkali -alkohol -allee -allein -allerwelts -allgemein -allianz -allrad -allround -alltags -allwetter -allzweck -alm -almosen -alpen -alpha -alster -alt -altar -alten -alternativ -alters -altertums -alterungs -altöl -alu -aluminium -amalgam -amateur -ameisen -amerika -ammen -ammoniak -ammonium -amnestie -amok -ampel -amphibien -amplituden -amts -anal -analog -analyse -ananas -anbau -andachts -andenken -andromeda -andruck -anerkennungs -anfänger -anfahr -anfahrts -anfangs -anfechtungs -anfeuerungs -anflug -anforderungs -anführungs -anfuhr -angebots -angehörigkeits -angel -angestellten -angler -angora -angriffs -angst -anhänger -anhörungs -animations -ankauf -ankaufs -anker -anklage -ankleide -ankündigungs -ankunfts -anlage -anlagen -anlauf -anlege -anleger -anleihe -anlieger -anmelde -annäherungs -annahme -annoncen -anoden -anordnungs -anpassungs -anrainer -anrechnungs -anrechts -anrede -anregungs -anreicherungs -anreise -anruf -ansatz -ansaug -anschaffungs -anschalt -anschauungs -anschlag -anschlags -anschluss -anschnall -anschraub -ansichts -ansiedlungs -ansprech -anspruchs -anstalts -anstands -ansteck -ansteckungs -anstellungs -ansteuer -ansteuerungs -anstiegs -anteil -anteils -antennen -anti -antifa -antiquariats -antiquitäten -antrags -antriebs -antritts -antwort -anwalts -anwartschafts -anweisungs -anwender -anwendungs -anwesenheits -anzahlungs -anzeige -anzeigen -anziehungs -anzug -aorten -apartment -apfel -apfelsinen -apostel -apotheken -apotheker -appartement -appetit -applikations -aprikosen -april -aquarell -araber -arbeiter -arbeitgeber -arbeitnehmer -arbeits -arbeitslosen -architekten -architektur -archiv -archivierungs -argument -argumentations -aristokraten -arkaden -arktis -arm -armaturen -armee -armen -armuts -arrest -arsch/n -arsen -art -arten -arterien -artikel -artikulations -artillerie -arznei -arzt -asbest -aschen -asien -asphalt -assembler -assistenz -assoziations -ast -asteroiden -asthma -astro -astronauten -asyl -atelier -atem -atemwegs -athleten -athletik -atlantik -atmungs -atom -attentats -audio -aufbau -aufbereitungs -aufbewahrungs -aufenthalts -auferstehungs -auffahrts -auffang -auffassungs -aufforderungs -auffrischungs -aufführungs -aufgabe -aufgaben -aufhebungs -aufheiz -aufklärungs -auflade -auflage -auflagen -aufliege -auflösungs -auflockerungs -aufmarsch -aufmerksamkeits -aufnahme -aufprall -aufputsch -aufrüstungs -aufruf -aufsatz -aufschlag -aufschnitt -aufschüttungs -aufsichts -aufspann -aufstands -aufsteck -aufstell -aufstellungs -aufstiegs -aufstock -auftakt -auftrags -auftriebs -auftritts -aufwärm -aufwärts -aufwach -aufwands -aufwickel -aufzeichnungs -aufzug -augen -august -augustiner -auktions -aussen -aussenbord -ausbau -ausbeutungs -ausbilder -ausbildungs -ausbreitungs -ausbruchs -ausdehnungs -ausdrück -ausdrucks -auseinander -ausfahrt -ausfall -ausflugs -ausfluss -ausführungs -ausfüll -ausfuhr -ausgabe -ausgaben -ausgangs -ausgeh -ausgleichs -ausguss -aushärte -aushilfs -auskunfts -ausländer -auslands -auslass -auslauf -ausleger -auslegungs -auslese -auslieferungs -auslöse -ausnahme -ausnutzungs -ausprägungs -auspuff -ausreise -ausrüstungs -aussage -ausschalt -ausscheidungs -ausschluss -ausschreibungs -ausschuss -aussichts -aussöhnungs -aussonderungs -ausspäh -ausstattungs -aussteige -aussteiger -ausstell -aussteller -ausstellungs -ausstiegs -austausch -austragungs -austritts -ausübungs -ausverkaufs -auswärts -auswahl -auswanderungs -ausweich -ausweis -ausweisungs -auswerte -auswertungs -auszahlungs -auszugs -authentifizierungs -auto -autogramm -automaten -automatik -automatisierungs -automobil -autonomie -autoren -autoritäts -avantgarde -bäcker -bänder -bären -baby -bach -bachelor -back -backen -bade -bagger -bahn -bahnhofs -bajonett -bakterien -balkan -balken -balkon -ball -ballett -ballon -ballungs -balz -bananen -band -banden -banditen -bank -banken -bankrott -bann -banner -bar -baracken -barbaren -barock -barometer -bart -basal -basalt -baseball -basis -basken -basketball -bass -bastel -bataillons -batterie -bau -bauch -bauern -baum -bazillen -beamten -beantragungs -beantwortungs -bearbeitungs -beat -beatmungs -beauty -bebauungs -beben -becher -becken -bedachungs -bedarfs -bedenken -bedeutungs -bedien -bediener -bedienungs -bedingungs -bedrohungs -bedürfnis -beeinflussungs -beerdigungs -befähigungs -befangenheits -befehls -befestigungs -beförderungs -befrachtungs -befragungs -befreiungs -befriedigungs -befruchtungs -befund -begabten -begabungs -begasungs -begattungs -begebungs -begeisterungs -beglaubigungs -begleit -begleiter -begnadigungs -begräbnis -begrenzer -begrenzungs -begriffs -begründungs -begrüssungs -behälter -behältnis -behandlungs -behebungs -behelfs -behilfs -behinderten -behörden -bei -beicht -beifalls -beileids -bein -beispiel -beistands -beitrags -beitritts -bekämpfungs -bekenner -bekenntnis -bekleidungs -belade -belagerungs -belastungs -belebungs -beleg -belegschafts -belegungs -belehrungs -beleidigungs -beleihungs -beleuchtungs -belichtungs -beliebtheits -belüftungs -bemessungs -benediktiner -benelux -benotungs -benutzer -benutzungs -benzin -beobachter -beobachtungs -bequemlichkeits -berater -beratschlagungs -beratungs -berechnungs -berechtigungs -bereichs -bereinigungs -bereitschafts -bereitstellungs -berg -bergmanns -bergungs -bericht -berichtigungs -berichts -bermuda -berührungs -berufs -berufungs -beruhigungs -besatzungs -beschäftigungs -beschaffungs -beschleunigungs -beschluss -beschreibungs -beschwerde -beschwichtigungs -beschwörungs -beseitigungs -besen -besetzungs -besichtigungs -besinnungs -besitz -besoldungs -bespitzelungs -besprechungs -besserungs -bestätigungs -bestands -bestattungs -bestechungs -besteck -bestell -besteuerungs -bestimmungs -bestrahlungs -bestückungs -besucher -besuchs -betätigungs -betäubungs -beteiligungs -beton -betonier -betrachtungs -betrags -betreuungs -betriebs -betrugs -bett -bettel -beuge -beurteilungs -beute -beutel -bevölkerungs -bewährungs -bewässerungs -bewachungs -bewegungs -beweis -bewerber -bewerbungs -bewertungs -bewilligungs -bewirtungs -bewölkungs -bewunderungs -bewusstseins -beziehungs -bezirks -bezugs -bibel -biber -bibliotheks -biedermeier -bienen -bier -bikini -bilanz -bilanzierungs -bild -bilder -bildungs -billard -billig -binär -binde -bindungs -binnen -bio -biologie -biometrie -birken -bischofs -bistums -bläser -blätter -blanko -blas -blasen -blatt -blau -blaubeer -blech -blei -bleibe -bleich -blick -blind -blinden -blink -blitz -block -blockade -blüten -blumen -blut -böller -börsen -böschungs -bob -bock -boden -bogen -bohnen -bohr -bomben -bomber -bon -bond -bonitäts -bonus -boom -boot -boots -bord -bordell -botanik -boten -botschafter -botschafts -boulevard -box -boykott -branchen -brand -brandungs -branntwein -brat -bratschen -brau -brauerei -braun -brause -braut -brech -brechungs -breit -breiten -brems -brenn -brett -bretter -brief -brigade -brikett -brillant -brillen -brötchen -broker -brombeer -bronchial -bronze -brot -brücken -bruch -bruder -brumm -brunnen -brust -brut -brutto -bücher -büchsen -bügel -bühnen -bündel -bündelungs -bündnis -bürger -bürgschafts -büro -bürsten -buben -buch -buchen -buchsen -buchstaben -buchungs -budget -bullen -bummel -bundes -bundestags -bungalow -bunker -bunt -burg -bus -buss -busch -busen -busgeld -butter -calcium -camping -cello -cellophan -charakter -charter -chat/n -chauffeur -chef -chemie -chemikalien -chiffre -chip -chor -christ -christen -chromosomen -cliquen -club -code -comic/n -computer -container -couch -cowboy -curry -dämm -dämmer -dämonen -dämpfungs -dach -damen -damm -dampf -dampfer -dank -dankes -darbietungs -darlehens -darlehns -darm -darstellungs -daseins -datei -daten -datums -dauer -daumen -daunen -deck -deckel -decken -deckungs -decodier -deeskalations -defensiv -definitions -defizit -deflations -dehnungs -deich -deklarations -deklinations -dekodier -dekorations -delegations -delegierten -delta -demo -demokratie -demokratisierungs -demonstrations -demontage -denitrifikations -denk -denkmal -dental -depositen -depot -depressions -design -designer -desinfektions -detail -deutsch -deutschland -devisen -dezember -dezimal -diät -diagnose -diagramm -dialog -dialyse -diamant -dicht -dichter -dichtungs -dick -diebes -diebstahl -dielen -dienst -dienstag -dienstags -diesel -diffamierungs -differential -differenz -differenzial -differenzierungs -diffusions -digital -diktier -diözesan -dioden -dioxid -diphtherie -diplom -diplomaten -direkt -direktions -dirigenten -disketten -diskont -diskussions -display -dispositions -distanz -distributions -disziplinar -disziplinierungs -dividenden -divisions -doktor -dokument -dokumentar -dokumentations -dokumenten -dolch -dollar -dolmetscher -dom -domino -donau -donner -donnerstag -donnerstags -doping -doppel -dorf -dornen -dosen -dosier -drachen -draht -dreck -drecks -dreh -drei -dreiecks -dreier -dressur -drillings -dringlichkeits -dritt -drogen -droh -drüsen -druck -drucker -dschungel -dünge -dünn -düsen -dudel -duft -dunkel -dunst -durchfluss -durchführungs -durchgangs -durchgriffs -durchhalte -durchlauf -durchmarsch -durchreise -durchschlag -durchschnitts -durchsetzungs -durchsuchungs -durchwahl -durst -dusch -dynamik -dynamit -echo -echtzeit -eck -edel -editier -effekten -effektiv -effizienz -ehe -ehegatten -ehren -eich -eichel -eichen -eidechsen -eier -eifersuchts -eigen -eigenschafts -eigentums -eignungs -eil -ein -einarbeitungs -einbau -einbruch -einbruchs -eindeckungs -eindrucks -einfahrt -einfall -einfalls -einfang -einfluss -einfühlungs -einführungs -einfüll -einfuhr -eingabe -eingangs -eingeweide -eingriffs -einheits -einhorn -einigungs -einkauf -einkaufs -einkommens -einkommensteuer -einlauf -einlege -einlieferungs -einmach -einmann -einnahme -einordnungs -einreise -einrichtungs -einsamkeits -einsatz -einschalt -einschränkungs -einschreibe -einschüchterungs -einschub -einschulungs -einschuss -einsende -einsortier -einsparungs -einspritz -einspruchs -einstands -einsteiger -einstell -einstellungs -einstich -einstiegs -einstufungs -einsturz -eintausch -einteilungs -eintopf -eintragungs -eintritts -einverständnis -einwärts -einwanderungs -einweg -einweihungs -einweisungs -einwilligungs -einwirkungs -einwohner -einzahlungs -einzel -einziehungs -einzugs -eis -eisen -eiter -eiweiss -ejakulations -ekel -elastik -elastizitäts -elch -elefanten -elektrizitäts -elektro -elektronen/n -elektronik -element -elementar -elends -elevations -elf -elfen -elfmeter -elite -ellbogen -ellen -eltern -emanzipations -embryonal -embryonen -emigranten -emissions -empfänger -empfängnis -empfangs -empfehlungs -empfindungs -emulations -emulsions -end -endlos -energie -engels -england -englisch -engpass -enkel -enquete -ensemble -entartungs -entbindungs -entdeckungs -enteignungs -enteisungs -enten -entertainment -entfaltungs -entfernungs -entflammungs -entflockungs -entführungs -entgelt -enthaarungs -enthauptungs -enthebungs -entkleidungs -entlade -entlassungs -entlastungs -entlaubungs -entlausungs -entlohnungs -entlüftungs -entminungs -entnahme -entnazifizierungs -entprellungs -entrauchungs -entriegelungs -entsalzungs -entschädigungs -entscheidungs -entschluss -entschuldigungs -entsorgungs -entspannungs -entstehungs -entwässerungs -entwickler -entwicklungs -entwurfs -entziehungs -erb -erd -erdbeer -erdungs -ereignis -erektions -erfahrungs -erfassungs -erfinder -erfindungs -erfolgs -erfrischungs -ergänzungs -ergebnis -erhaltungs -erhebungs -erholungs -erinnerungs -erkältungs -erkenntnis -erkennungs -erklärungs -erkundungs -ermächtigungs -ermessens -ermittlungs -ermüdungs -ernährungs -erneuerungs -ernte -eröffnungs -eroberungs -erpressungs -erprobungs -erregungs -errichtungs -ersatz -erscheinungs -erschiessungs -erschöpfungs -ersetzungs -erst -erstellungs -erstickungs -ertrags -erwachsenen -erwartungs -erweiterungs -erwerbs -erz -erzeuger -erzeugungs -erziehungs -eskalations -ess -essens -essig -etagen -etappen -etat -ethik -etiketten -etüden/n -eulen -euro -europa -evaluierungs -evolutions -examens -exekutiv -exil -existenz -exklusiv -expansions -expeditions -experimental -experimentier -experten -explosions -explosiv -export -extra -extrem -fächer -fähr -fälligkeits -fälschung -fälschungs -fäulnis -fabrik -fabrikations -facetten -fach -fackel -fahndungs -fahnen -fahr -fahrer -fahrt -fahrten -fahrzeug -fakten -fall -falsch -falt -falten -familien -fanfaren -fang -farb -faschings -faser -fassetten -fassungs -faust -februar -fecht -feder -feger -fehl -fehler -feier -feiertags -feigen -fein -feind -feld -fell -fels -felsen -fenster -ferien -fern -fernseh -fertig -fertigungs -fest -festival -fett -feuchtigkeits -feuer -fichten -fick/n -fieber -film -filter -finanz -finanzierungs -findungs -finger -firmen -firmware -fisch -fischer -fischerei -fitness -fixier -fixpunkt -flächen -flach -flammen -flaschen -flecken -fleisch -fliegen -flieger -fliess -fliesen -flöten -flocken -flotten -flüchtlings -flügel -flüssig -flüssigkeits -flucht -flug -flugzeug -flur -fluss -flut -förder -förderungs -folge -folien -folter -forderungs -foren -form -formaldehyd -formatierungs -formel -formular -formulierungs -forscher -forschungs -forst -fortbildungs -fortpflanzungs -fortschritts -fotzen -fräs -fracht -frage -fraktions -frauen -frei -freigabe -freiheits -freitag -freitags -freiwilligen -freizeit -fremd -fremden -fremdsprachen -frequenz -fress -freuden -freundschafts -friedens -frisch/n -friseur -front -frontal -frosch -frost -früchte -früh -frühlings -frühstücks -frucht -fruchtbarkeits -führer -führungs -füll -fünf -fürsorge -fürsten -fuchs -fugen -fundamental -funk -funktions -furnier -fuss -fusions -futter -gänse -gäste -gabel -gala -galerie -galgen -gallen -galopp -gang -gangster -ganzkörper -ganztags -ganzzahl -garagen -garantie -garderoben -gardinen -garten -gas -gast -gattungs -gaumen -gebär -gebäude -geber -gebets -gebiets -gebirgs -gebläse -gebrauchs -gebraucht -gebühren -geburten -geburts -geburtstags -gedächtnis -gedanken -gedenk -gedulds -gefährdungs -gefängnis -gefäss -gefahren -gefahrenstoff -gefahrstoff -geflügel -gefrier -gefühls -gegen -gegenwarts -gehäuse -gehalts -geheim -geheimnis -gehirn -gehör -geigen -geister -geistes -gelände -geld -gelegenheits -gelehrten -geleit -gelenk -geltungs -gemälde -gemeinde -gemeinschafts -gemüse -gemüts -gen -genehmigungs -general -generations -genesungs -genital -genossenschafts -genuss -geometrie -gepäck -geräte -geräusch -gerechtigkeits -gerichts -gerinnungs -geröll -gersten -geruchs -gesäss -gesamt -gesang -gesangs -geschäfts -geschenk -geschichts -geschirr -geschlechter -geschlechts -geschmacks -geschoss -geschwindigkeits -geschwulst -gesellschafts -gesetzes -gesetzgebungs -gesichts -gesinnungs -gespenster -gesprächs -gestaltungs -gesteins -gesundheits -getränke -getreide -getriebe -gewähr -gewalt -gewebe -gewehr -gewerbe -gewerkschafts -gewichts -gewinde -gewinn -gewinnungs -gewissens -gewitter -gewohnheits -gewürz -giess -giesserei -gift -gipfel -gips -giro -gitarren -gitter -gläubiger -glanz -glas -glaubens -glaubwürdigkeits -gleich -gleichheits -gleis -gleit -gletscher -gliederungs -glimm -glitzer -global -globalisierungs -glocken -glücks -glückwunsch -glüh -götter -götzen -gold -golf -gottes -grab -graben -grafik -grammatik -granat -gras -gravitations -greif -grenz -griff -grill -grippe -grössen -grob -gross -grün -gründer -gründungs -gruben -grund -grundstücks -gruppen -gruss -grusel -gültigkeits -gürtel -güte -güter -guck -guerilla -gummi -gurken -gurt -guss -guts -gutschein -gymnasiasten -gymnastik -händler -hänge -härte -häufigkeits -häuser -haar -hack -hafen -hafer -haft -haftungs -hagel -haken -halb -hallen -halogen -hals -haltbarkeits -halte -halterungs -haltungs -hammel -hammer -hand -handels -handlungs -handy -hanf -hang -hardware -harmonie -harn -hart -hasel -hasen -hass -haupt -haus -haushalts -haut -hebel -heck -hecken -heeres -heft -heil -heilungs -heim -heimat -heirats -heiss -heiz -heizungs -helden -helium -helligkeits -hemd -herbergs -herbst -herkunfts -herren -herrschafts -herrscher -hersteller -herstellungs -herz -hetz -heuschrecken -hexen -hierarchie -hilfe -hilfs -himbeer -himmel -himmels -hindernis -hinter -hintern -hinweis -hirn -hirsch -hirten -hitze -höchst -höhen -höhlen -höllen -hör -hörer -hobby -hobel -hoch -hochzeits -hockey -hof -hoffnungs -hoheits -hohl -holz -honig -honorar -horizont -hormon -horror -hosen -hotel -hüft -hügel -hühner -hülsen -hürden -hütchen -hütten -hub -hubschrauber -huf -human -hunde -hunger -husten -hut -hybrid -hydraulik -hypotheken -ideal -ideen -identifikations -identitäts -ideologie -image -imbiss -immatrikulations -immissions -immobilien -immun -impf -implementations -implementierungs -import -improvisations -impuls -index -indikations -individual -indizierungs -induktions -industrie -infektions -inflations -info -informatik -informations -infrarot -ingenieur -ingenieurs -inhaber -inhalts -initialisierungs -inlands -innen -innovations -insekten -insel -insider -insolvenz -installations -instituts -instrumental -instrumenten -insulin -integrations -integritäts -intelligenz -interessen -interims -internats -internet -internierungs -interoperabilitäts -interpretations -interventions -invasions -inventur -investitions -investment -ionen -ionisierungs -islam -isolier -jäger -jacken -jagd -jahres -jahrhundert -jammer -januar -japan -jazz -job -joghurt -journal -jubel -jubiläums -juden -jugend -juli -jung -juni -juristen -justiz -jute -juwelen -juwelier -käfig -kälte -käse -käufer -kabel -kabinen -kabinetts -kaffee -kaiser -kalbs -kalender -kalk -kalkulations -kalorien -kalt -kamel -kamera -kamin -kammer -kampf -kanal -kanalisations -kandidaten -kaninchen -kanonen -kanten -kantinen -kanzlei -kanzler -kapazitäts -kapitäns -kapital -karamell -karawanen -karibik -karnevals -karosserie -karriere -kartei -kartell -karten -kartoffel -karton -kasernen -kassen -kassetten -kastanien -kasten -kastrations -katastrophen -katzen -kauf -kaufmanns -kausal -kautschuk -kavallerie -kegel -kehlkopf -kehr -keil -keim -kelch -keller -kenn -kenntnis -keramik -kerker -kern -kerzen -kessel -ketten -ketzer -keuschheits -kiefer -kiel -kiesel -kilometer -kinder -kindes -kindheits -kinn -kino -kipp -kirch -kirchen -kirsch -kissen -kisten -klär -klage -klammer -klang -klapp -klappen -klarinetten -klartext -klassen -klatsch -klausur -klavier -kleb -klebe -kleider -kleidungs -klein -kleinst -klemm -klemmen -klempner -kletter -klima -klingel -klinik -klinker -kloster -klub -knaben -knack -knall -knebel -kneipen -knet -knie -knochen -knopf -knoten -knüppel -königs -körper -koalitions -koch -kodier -koffer -kohle -kohlen -kolben -kollateral -kollektiv -kollisions -kolonial -kombinations -komfort -kommando -kommissions -kommunal -kommunikations -kompakt -kompanie -kompass -kompatibilitäts -kompensations -kompetenz -komplett -komplexitäts -komposita -kompositions -kompressions -kompromiss -kondens -konditions -kondom -konfektions -konferenz -konfessions -konfigurations -konfirmations -konflikt -konformitäts -konfrontations -kongress -konjugations -konjunktur -konkurrenz -konkurs -konserven -konservierungs -konsolidierungs -konsortial -konsortiums -konstruktions -konsular -konsulats -konsultations -konsum -kontakt -konten -kontext -kontinental -kontingent -konto -kontrast -kontroll -konversations -konzentrations -konzept -konzern -konzert -konzessions -kooperations -koordinaten -koordinations -koordinierungs -kopf -kopier -koppel -kopplungs -korallen -korb -kord -kork -korn -korrektur -korrelations -korrespondenz -korruptions -korsett -kosmetik -kosten -kostüm -kräfte -kräuter -krabben -kraft -kran -kranken -krankheits -kranz -krawatten -krebs -kredit -kreide -kreis -kreuz -kriegs -kriminal -kriminalitäts -krisen -kristall -kritik -kröten -kron -küchen -kühl -kündigungs -künstler -kürzungs -küsten -kuchen -kugel -kuh -kultur -kultus -kunde -kunden -kunst -kupfer -kupplungs -kur -kurier -kurs -kurven -kurz -kuschel -länder -längen -längs -lärm -labor -lach -lack -lade -laden -ladungs -lagen -lager -laminat -lampen -land -lande -landes -landschafts -landtags -landungs -lang -langsam -laptop -laser -last -lasten -latenz -laternen -latten -laub -lauf -lausch -lawinen -leasing -lebens -leber -leck -leder -leer -legitimations -lehm -lehr -lehrer -lehrgangs -leichen -leicht -leih -leisten -leistungs -leit -leiter -leitungs -lenden -lenk -lern -lese -leucht -licht -liebes -lieblings -liefer -liege -linien -links -linsen -lippen -liquidations -liquiditäts -listen -literatur -lizenz -löffel -löss/n -lösch -lösungs -löt -löwen -lobby -loch -lock -locken -logik -lohn -lokal -lorbeer -lotterie -lotto -lücken -lüftungs -lügen -luft -lumineszenz -lungen -lust -luxus -lymph -mächte -mädchen -mängel -männer -märchen -märz -macht -magen -magister -magnet -mahn -mai -makro -mammut -mandel -mangel -manipulations -mannschafts -mantel -manuskript -mappen -marathon -marder -margarine -marine -marken -markt -marmor -marsch -mass -maschinen -masken -massage -massen -massiv -mast -material -mathematik -matrikel -matrix -matrosen -mauer -maul -maus -maut -maximal -medaillen -medien -medikamenten -medizin -meeres -mehl -mehr -mehrheits -meinungs -meister -meisterschaft -meisterschafts -melanom -melde -mengen -mensa -menschen -menschheits -menstruations -menü -merk -mess -messe -messer -messing -metall -methadon -methoden -miet -mieter -migrations -mikro -milch -militär -milliarden -millionärs -millionen -minderheiten -minderheits -mindest -minen -mineral -mini -miniatur -minimal -minister -ministerial -minuten -misch -mischungs -missbrauchs -mit -mitarbeiter -mitglieder -mitglieds -mittags -mitteilungs -mittel -mitternachts -mittwoch -mittwochs -möbel -mobil -mode -modell -modernisierungs -modul -modularisierungs -molkerei -monats -mond -monitor -monopol -monster -montag -montage -montags -montan -moor -moränen -moral -mord -morgen -morse -motor -motoren -motten -mücken -müll -münz -mütze -mull/n -multimedia -mund -munitions -murmel -muschel -museums -musik -muskel -muster -mutter -näh -näherungs -nähr -nachbar -nachfolge -nachhilfe -nachkriegs -nachlauf -nachmittags -nachnahme -nachrichten -nachschlage -nachschub -nacht -nachweis -nachwuchs -nachzahlungs -nadel -nagel -nahrungs -namens -nano -narren -nasen -national -natrium -natur -navigations -nazi -nebel -neben -negativ -neger/n -neigungs -nelken -nenn -neo/n -nerven -netto -netz -neu -neujahrs -neun -neutralitäts -neutronen -nibelungen -nicht -nieder -niederschlags -nieren -nischen -nobel -nomaden -nominal -nord -normal -not -notar -notaus -noten -notstands -november -nuklear -null -nummern -nuss -nutz -nutzer -nutzungs -öffnungs -öko -öl -obduktions -ober -objekt -obst -ofen -offensiv -offiziers -ohr -ohren -oktober -olympia -omnibus -online -operations -operetten -opern -opfer -oppositions -optimierungs -options -oral -orangen -orchester -ordner -ordnungs -organ -organisations -orgel -orient -orientierungs -original -orts -ortungs -ost -oster -oxydations -ozean -ozon -pacht -pack -paket -palästinenser -palast -panik -pannen -panorama -panzer -papier -papp -paprika -papst -para/n -parade -paradies -parallel -parameter -park -parkett -parlaments -partei -parteien/n -parteitags -partisanen -partner -pass -passagier -passier -patent -patienten -patrouillen -pauschal -pausen -pegel -peil -pelz -pendel -penis -pensions -perioden -peripherie -perlen -persönlichkeits -personal -personen -pfad -pfand -pfarr -pfeffer -pfeil -pferde -pfingst -pflanzen -pflege -pflicht -pharma -phasen -philologie -photonen -physik -pickel -piezo -pilger -piloten -pilz -piraten -piraterie -pistolen -pixel -plättchen -plagiats -planeten -planungs -plastik -platin -platinen -platten -platz -platzierungs -pleite -pleiten -plexiglas -pokal -pol -polar -polarisations -polier -polit -politik -polizei -polster -poren -porno/n -porzellan -posaunen -positions -positiv -post -potenz -präsidenten -präsidentschafts -präventiv -präzisions -pracht -praktikanten -praktikums -praxis -preis -press -presse -prestige -priester -privat -privatisierungs -probe -proben -problem -produkt -produktions -produktiv -produktivitäts -professoren -profi -profil -prognose -programm -programmier -projekt -projektions -propaganda -proportional -prostitutions -protein -protest -protokoll -provinz -prozess -prozessor -prüf -prüfungs -prügel -pseudo -publikums -puder -puffer -pullover -pump -pumpen -punkt -punkte -pupillen -puppen -putz -quadrat -qualitäts -quanten -quartals -quell -quellen -quer -quoten -räumungs -rabatt -rad -radar -radial -radio -radium -rahmen -raketen -rand -rang -rasen -rasier -rassen -rast -raster -rationalisierungs -rats -ratten -raub -rauch -raucher -raum -rausch -reaktions -reaktor -real -realitäts -rebellen -rechen -recherche -rechner -rechnungs -rechte -rechteck -rechts -rechtschreib -recycling -rede -referenz -reflex -reflexions -reform -reformations -regel -regelungs -regen -regierungs -regional -register -registrier -regulierungs -rehabilitations -reibungs -reichs -reichstags -reifen -reihen -reinigungs -reinlichkeits -reise -reit -reiter -reiz -reklame -rekord -rekrutierungs -relais -relativ -religions -renn -renten -reparatur -reporter -repräsentations -reptilien -reserve -resonanz -ressourcen -rest -restrukturierungs -rettungs -revolutions -rezessions -rhythmus -richt -richter -richtungs -riesen -ring -ringel -rippen -risiko -riss -ritter -röhren -röntgen -roboter -rock -roh -rohr -roll -rollen -roman -rosen -rost -rot -rotations -routine -rück -rücken -rüstungs -ruder -ruf -ruhe -rumpf -rund -säge -sättigungs -säuglings -säulen -sabotage -sach -saft -saison -salat -salz -samen -sammel -sammler -samstag -samstags -sand -sanierungs -sanitär -sanitäts -sarg -satelliten -sattel -satz -sauberkeits -sauer -saug -schädel -schädlings -schätz -schach -schad -schaden -schadens -schaf -schaffens -schall -schalt -schatten -schatz -schau -schaufel -schaukel -schaum -scheck -scheiben -scheidungs -schein -schenkel -schicht -schichten -schicksals -schiebe -schieds -schiefer -schienen -schiess -schiffer -schifffahrts -schiffs -schild -schinken -schirm -schlacht -schlaf -schlag -schlager -schlamm -schlangen -schlauch -schleif -schleifen -schleim -schlepp -schlepper -schleuder -schlichtungs -schliess -schlitten -schlitz -schloss -schlosser -schlüssel -schluck -schlupf -schluss -schmal -schmelz -schmerz -schmerzens -schmiede -schmier -schmuck -schmuggel -schmuggler -schmutz -schnarch -schnee -schneid -schneide -schnell -schnitt -schnür -schön -schönheits -schöpfer -schöpfungs -schock -schokoladen -schon -schornstein -schotter -schräg -schrank -schranken -schraub -schrauben -schreck -schreckens -schreib -schrift -schritt -schrott -schüler -schürzen -schützen -schub -schuh -schul -schuld -schulden -schulter -schulungs -schuppen -schuss -schutt -schutz -schwäche -schwangerschafts -schwanz -schwarz -schwebe -schwefel -schweige -schweine -schweiss -schwellen -schwemmungs -schwenk -schwer -schwert -schwester -schwestern -schwierigkeits -schwimm -schwindel -schwing -schwingungs -schwitz -schwung -sechs -see -seelen -segel -segment -seh -sehnen -seiden -seifen -seil -seiten -sekretariats -sekt -sekten -sektor -sekundär -sekunden -selbst -semmel -senats -sende -senf -senioren -senk -sensations -sensibilitäts -sensor -september -serien -server -service -sesam -sessel -seuchen -sexual -sichel -sicherheits -sicherungs -sicht -sieben -siedler -siedlungs -sieges -signal -silber -silikon -silvester -simulations -sing -sinus -sippen -sitten -sitz -sitzungs -skandal -ski -sklaven -smog -sofort -software -soja -soldaten -solidaritäts -solo -sommer -sonder -sonnen -sonntag -sonntags -sorgfalts -sossen -souveränitäts -sowjet -sozial -sozialisierungs -späh -spät -spachtel -spalt -spalten -spaltungs -spann -spannungs -spar -sparer -spass -spazier -speichel -speicher -speise -spekulations -spenden -spender -sperr -spesen -spezial -spiegel -spiel -spinnen -spionage -spiral -spitz -spitzen -splitter -sport -spott -sprach -sprech -spreiz -spreng -spring -spritz -sprüh -sprung -spül -spür -spur -spuren -städte -stätten -staaten -staats -stabilisierungs -stabs -stachel -stadion -stadt -stahl -stamm -stammes -stand -standard -standardisierungs -standes -standort -stangen -stapel -start -stationierungs -status -staub -staubsauger -stech -steck -steig -steiger -steil -stein -stell -stellen -stellungs -stemm -stempel -sterbe -stern -steuer -steuerungs -stich -stickstoff -stiefel -stift -stimm -stimmen -stimulations -stirn -stör -störungs -stock -stoff -stolper -stoss -straf -strahlen -strahlungs -strassen -strategie -streb -streck -strecken -streich -streif -streifen -streik -streit -streu -streusel -strich -strick -stroh -strom -struktur -strumpf -stück -stütz -studenten -studien -studierenden -stufen -stuhl -stunden -sturm -sturz -süd -sünden -süss -süssigkeiten -sub/n -subjekt/n -subventions -such -sucht -sumpf -super -suppen -symbol -sympathie -symphonie -synchron -synchronisations -synchronisierungs -synonym -system -szene -tätigkeits -täuschungs -tabak -tabellen -tabu -tabulator -tafel -tages -tagungs -takt -tank -tannen -tanz -tapeten -tarif -tarn -taschen -tastatur -tasten -tat -tatsachen -tauch -taucher -tauf -tausch -taxi -technik -technologie -tee -teil -teile -teilnehmer -teilungs -tele -telefon -teller -temperatur -tempo -tennis -teppich -termin -terrassen -territorial -terror -terrorismus -terroristen -test -tetanus -teufels -text -textil -theater -themen -theologie -therapie -thermo -thron -tief -tier -tinten -tipp -tisch -titan -titel -töpfer -tochter -todes -toiletten -toleranz -tomaten -ton -top -tor -torf -total -toten -touristen -touristik -träger -tränen -trafo -trag -trage -trainer -trainings -trampel -tranchier -transaktions -transfer -transfusions -transistor -transit -transport -trassen -trauben -trauer -traum -treib -trend -trenn -trennungs -treppen -tret -treue -treuehand -treuhand -trick -trieb -trink -tritt -trocken -trommel -trompeten -tropen -trümmer -truppen -tür -tuberkulose -tuch -tugend -tulpen -tunnel -turbinen -turbo -turm -turn -turnier -tusch -typen -über -überbrückungs -überdruck -überfall -übergabe -übergangs -überhol -überlagerungs -überlassungs -überlebens -übernachtungs -übernahme -überraschungs -überschlags -überschuss -übersetzer -übersetzungs -übersichts -übertragungs -überwachungs -übungs -ufer -uhr -uhrgross -uhrkunden -ultra -umbau -umbruch -umbuchungs -umdenk -umformungs -umfrage -umgangs -umgebungs -umgehungs -umkehr -umkleide -umlauf -umrechnungs -umsatz -umschalt -umschlag -umsetzungs -umspann -umsteige -umstellungs -umtausch -umwandlungs -umwelt -umzugs -unabhängigkeits -unbedenklichkeits -unfall -unglücks -unions -universal -universitäts -unkosten -unrechts -unter -unterhalts -unterlassungs -unternehmens -unternehmer -unternehmungs -unterrichts -unterstützer -unterstützungs -untersuchungs -uran -urheber -urkunden -urlauber -urlaubs -ursprungs -urteils -vakuum -variablen -varianz -variations -varietee -variet� -vater -vaterschafts -vatikan -vegetations -veilchen -vektor -venen -ventil -veränderungs -veräusserungs -veranstaltungs -verantwortungs -verarbeitungs -verb -verbands -verbindungs -verbots -verbraucher -verbrauchs -verbrechens -verbrecher -verbreitungs -verbrennungs -verbund -verdachts -verdauungs -verdienst -vereins -vererbungs -verfahrens -verfall -verfalls -verfassungs -verfolgungs -verfügungs -verführungs -vergabe -vergeltungs -vergleichs -vergnügungs -vergrösserungs -vergütungs -verhaltens -verhandlungs -verhütungs -verkabelungs -verkaufs -verkehrs -verlängerungs -verlagerungs -verlags -verletzungs -verlobungs -verlust -vermarktungs -vermehrungs -vermessungs -vermietungs -vermittlungs -vermögens -vernehmlassungs -veröffentlichungs -verordnungs -verpackungs -verrechnungs -verrottungs -versäumnis -versammlungs -versand -verschleppungs -verschlüsselungs -verschluss -verschreibungs -versicherungs -versions -versorgungs -verständigungs -verstärker -verstärkungs -verstandes -versteigerungs -verstell -versuchs -vertauschungs -verteidigungs -verteilungs -verträglichkeits -vertrags -vertrauens -vertreter -vertretungs -vertriebs -vervielfältigungs -verwaltungs -verwandlungs -verwandtschafts -verwendungs -verwertungs -verwirklichungs -verzeichnis -verzierungs -verzugs -vexier -vibrations -video -vieh -viel -vier -viertel -villen -violin -viren -virtualisierungs -virus -vitamin -vize -völker -vogel -vokal -volks -voll -vollstreckungs -vollzugs -volontariats -volumen -vor -vorab -vorbereitungs -vorder -vorführ -vorgänger -vorgangs -vorjahres -vorkriegs -vorschub -vorsorge -vorstands -vorstellungs -vortags -vortrags -vortriebs -vorverkaufs -vorzugs -vulkan -wähler -währungs -wärm -wärme -wäsche -wach -wacholder -wachs -wachstums -waden -waffen -wagen -wahl -wahrheits -wahrnehmungs -wahrscheinlichkeits -waisen -wald -walz -walzen -wand -wander -wannen -waren -warm -warn -warte -wartungs -wasch -wasser -watte -web -wechsel -weg -wehr -weiber -weich -weide -weiden -weih -weihnachts -wein -weiss -weisungs -weiter -weizen -well/n -wellen -welt -wendel -werbe -werk -werks -werkstatt -werkzeug -wert -werte -wesens -wespen -west -wett -wettbewerbs -wetter -wetz -wickel -widerspruchs -widerstands -widmungs -wieder -wiedergabe -wiederhaken -wiederhol -wiederholungs -wiederruf -wiegen -wild -willens -wind -windel -winden -windows -winkel -winter -wirbel -wirkungs -wirtschafts -wissens -wissenschaftler -wissenschafts -witterungs -witwen -wörter -wochen -wohl -wohlfahrts -wohltätigkeits -wohn -wohnungs -wolfs -wolken -woll -wonne -wort -wühl -würfel -würge -wüsten -wucher -wund -wunder -wunsch -wurf -wurm -wurst -wurzel -wut -zähl -zähler -zahl -zahlen -zahlungs -zahn -zapf -zauber -zaun -zehn -zeichen -zeichnungs -zeige -zeilen -zeit -zeitungs -zell -zellen -zelt -zement -zensur -zentral -zentrifugal -zentrums -zerfalls -zermürbungs -zersetzungs -zerstörungs -zettel -zeugen -zeugnis -zeugungs -zickzack -ziegel -ziegen -ziel -zier -ziffern -zigaretten -zigarren -zigeuner -zimmer -zimt -zink -zinn -zins -zirkus -zitronen -zivil -zoll -zonen -zoo -zünd -zubereitungs -zubringer -zucht -zucker -zufalls -zug -zugangs -zugriffs -zuhörer -zukunfts -zulassungs -zulauf -zuleitungs -zuliefer -zungen -zuordnungs -zupf -zusammen -zusatz -zuschauer -zuschlags -zustands -zustell -zustellungs -zutritts -zuwachs -zuwanderungs -zuweisungs -zwangs -zweck -zwei -zweier -zweig -zweit -zwerg -zwiebel -zwillings -zwischen -zwölf -zylinder \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/german/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/german/schema.xml deleted file mode 100644 index 8a9a5d679..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/schema.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/german/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/german/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json deleted file mode 100644 index bf64a7792..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/_schema_analysis_stopwords_greek.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ο", - "η", - "το", - "οι", - "τα", - "του", - "τησ", - "των", - "τον", - "την", - "και", - "κι", - "κ", - "ειμαι", - "εισαι", - "ειναι", - "ειμαστε", - "ειστε", - "στο", - "στον", - "στη", - "στην", - "μα", - "αλλα", - "απο", - "για", - "προσ", - "με", - "σε", - "ωσ", - "παρα", - "αντι", - "κατα", - "μετα", - "θα", - "να", - "δε", - "δεν", - "μη", - "μην", - "επι", - "ενω", - "εαν", - "αν", - "τοτε", - "που", - "πωσ", - "ποιοσ", - "ποια", - "ποιο", - "ποιοι", - "ποιεσ", - "ποιων", - "ποιουσ", - "αυτοσ", - "αυτη", - "αυτο", - "αυτοι", - "αυτων", - "αυτουσ", - "αυτεσ", - "αυτα", - "εκεινοσ", - "εκεινη", - "εκεινο", - "εκεινοι", - "εκεινεσ", - "εκεινα", - "εκεινων", - "εκεινουσ", - "οπωσ", - "ομωσ", - "ισωσ", - "οσο", - "οτι" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/schema.xml deleted file mode 100644 index c9bfe7245..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/schema.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/greek/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json deleted file mode 100644 index 070fa4308..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/_schema_analysis_stopwords_hindi.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "अंदर", - "अत", - "अपना", - "अपनी", - "अपने", - "अभी", - "आदि", - "आप", - "इत्यादि", - "इन", - "इनका", - "इन्हीं", - "इन्हें", - "इन्हों", - "इस", - "इसका", - "इसकी", - "इसके", - "इसमें", - "इसी", - "इसे", - "उन", - "उनका", - "उनकी", - "उनके", - "उनको", - "उन्हीं", - "उन्हें", - "उन्हों", - "उस", - "उसके", - "उसी", - "उसे", - "एक", - "एवं", - "एस", - "ऐसे", - "और", - "कई", - "कर", - "करता", - "करते", - "करना", - "करने", - "करें", - "कहते", - "कहा", - "का", - "काफ़ी", - "कि", - "कितना", - "किन्हें", - "किन्हों", - "किया", - "किर", - "किस", - "किसी", - "किसे", - "की", - "कुछ", - "कुल", - "के", - "को", - "कोई", - "कौन", - "कौनसा", - "गया", - "घर", - "जब", - "जहाँ", - "जा", - "जितना", - "जिन", - "जिन्हें", - "जिन्हों", - "जिस", - "जिसे", - "जीधर", - "जैसा", - "जैसे", - "जो", - "तक", - "तब", - "तरह", - "तिन", - "तिन्हें", - "तिन्हों", - "तिस", - "तिसे", - "तो", - "था", - "थी", - "थे", - "दबारा", - "दिया", - "दुसरा", - "दूसरे", - "दो", - "द्वारा", - "न", - "नहीं", - "ना", - "निहायत", - "नीचे", - "ने", - "पर", - "पर", - "पहले", - "पूरा", - "पे", - "फिर", - "बनी", - "बही", - "बहुत", - "बाद", - "बाला", - "बिलकुल", - "भी", - "भीतर", - "मगर", - "मानो", - "मे", - "में", - "यदि", - "यह", - "यहाँ", - "यही", - "या", - "यिह", - "ये", - "रखें", - "रहा", - "रहे", - "ऱ्वासा", - "लिए", - "लिये", - "लेकिन", - "व", - "वर्ग", - "वह", - "वह", - "वहाँ", - "वहीं", - "वाले", - "वुह", - "वे", - "वग़ैरह", - "संग", - "सकता", - "सकते", - "सबसे", - "सभी", - "साथ", - "साबुत", - "साभ", - "सारा", - "से", - "सो", - "ही", - "हुआ", - "हुई", - "हुए", - "है", - "हैं", - "हो", - "होता", - "होती", - "होते", - "होना", - "होने", - "अपनि", - "जेसे", - "होति", - "सभि", - "तिंहों", - "इंहों", - "दवारा", - "इसि", - "किंहें", - "थि", - "उंहों", - "ओर", - "जिंहें", - "वहिं", - "अभि", - "बनि", - "हि", - "उंहिं", - "उंहें", - "हें", - "वगेरह", - "एसे", - "रवासा", - "कोन", - "निचे", - "काफि", - "उसि", - "पुरा", - "भितर", - "हे", - "बहि", - "वहां", - "कोइ", - "यहां", - "जिंहों", - "तिंहें", - "किसि", - "कइ", - "यहि", - "इंहिं", - "जिधर", - "इंहें", - "अदि", - "इतयादि", - "हुइ", - "कोनसा", - "इसकि", - "दुसरे", - "जहां", - "अप", - "किंहों", - "उनकि", - "भि", - "वरग", - "हुअ", - "जेसा", - "नहिं" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/schema.xml deleted file mode 100644 index 85c5302f3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/schema.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hindi/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json deleted file mode 100644 index 05e253146..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/_schema_analysis_stopwords_hungarian.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "ahogy", - "ahol", - "aki", - "akik", - "akkor", - "alatt", - "által", - "általában", - "amely", - "amelyek", - "amelyekben", - "amelyeket", - "amelyet", - "amelynek", - "ami", - "amit", - "amolyan", - "amíg", - "amikor", - "át", - "abban", - "ahhoz", - "annak", - "arra", - "arról", - "az", - "azok", - "azon", - "azt", - "azzal", - "azért", - "aztán", - "azután", - "azonban", - "bár", - "be", - "belül", - "benne", - "cikk", - "cikkek", - "cikkeket", - "csak", - "de", - "e", - "eddig", - "egész", - "egy", - "egyes", - "egyetlen", - "egyéb", - "egyik", - "egyre", - "ekkor", - "el", - "elég", - "ellen", - "elő", - "először", - "előtt", - "első", - "én", - "éppen", - "ebben", - "ehhez", - "emilyen", - "ennek", - "erre", - "ez", - "ezt", - "ezek", - "ezen", - "ezzel", - "ezért", - "és", - "fel", - "felé", - "hanem", - "hiszen", - "hogy", - "hogyan", - "igen", - "így", - "illetve", - "ill.", - "ill", - "ilyen", - "ilyenkor", - "ison", - "ismét", - "itt", - "jó", - "jól", - "jobban", - "kell", - "kellett", - "keresztül", - "keressünk", - "ki", - "kívül", - "között", - "közül", - "legalább", - "lehet", - "lehetett", - "legyen", - "lenne", - "lenni", - "lesz", - "lett", - "maga", - "magát", - "majd", - "majd", - "már", - "más", - "másik", - "meg", - "még", - "mellett", - "mert", - "mely", - "melyek", - "mi", - "mit", - "míg", - "miért", - "milyen", - "mikor", - "minden", - "mindent", - "mindenki", - "mindig", - "mint", - "mintha", - "mivel", - "most", - "nagy", - "nagyobb", - "nagyon", - "ne", - "néha", - "nekem", - "neki", - "nem", - "néhány", - "nélkül", - "nincs", - "olyan", - "ott", - "össze", - "ő", - "ők", - "őket", - "pedig", - "persze", - "rá", - "s", - "saját", - "sem", - "semmi", - "sok", - "sokat", - "sokkal", - "számára", - "szemben", - "szerint", - "szinte", - "talán", - "tehát", - "teljes", - "tovább", - "továbbá", - "több", - "úgy", - "ugyanis", - "új", - "újabb", - "újra", - "után", - "utána", - "utolsó", - "vagy", - "vagyis", - "valaki", - "valami", - "valamint", - "való", - "vagyok", - "van", - "vannak", - "volt", - "voltam", - "voltak", - "voltunk", - "vissza", - "vele", - "viszont", - "volna" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/schema.xml deleted file mode 100644 index 4a67b67be..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/hungarian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json deleted file mode 100644 index d147fbd41..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/_schema_analysis_stopwords_indonesian.json +++ /dev/null @@ -1,365 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ada", - "adanya", - "adalah", - "adapun", - "agak", - "agaknya", - "agar", - "akan", - "akankah", - "akhirnya", - "aku", - "akulah", - "amat", - "amatlah", - "anda", - "andalah", - "antar", - "diantaranya", - "antara", - "antaranya", - "diantara", - "apa", - "apaan", - "mengapa", - "apabila", - "apakah", - "apalagi", - "apatah", - "atau", - "ataukah", - "ataupun", - "bagai", - "bagaikan", - "sebagai", - "sebagainya", - "bagaimana", - "bagaimanapun", - "sebagaimana", - "bagaimanakah", - "bagi", - "bahkan", - "bahwa", - "bahwasanya", - "sebaliknya", - "banyak", - "sebanyak", - "beberapa", - "seberapa", - "begini", - "beginian", - "beginikah", - "beginilah", - "sebegini", - "begitu", - "begitukah", - "begitulah", - "begitupun", - "sebegitu", - "belum", - "belumlah", - "sebelum", - "sebelumnya", - "sebenarnya", - "berapa", - "berapakah", - "berapalah", - "berapapun", - "betulkah", - "sebetulnya", - "biasa", - "biasanya", - "bila", - "bilakah", - "bisa", - "bisakah", - "sebisanya", - "boleh", - "bolehkah", - "bolehlah", - "buat", - "bukan", - "bukankah", - "bukanlah", - "bukannya", - "cuma", - "percuma", - "dahulu", - "dalam", - "dan", - "dapat", - "dari", - "daripada", - "dekat", - "demi", - "demikian", - "demikianlah", - "sedemikian", - "dengan", - "depan", - "di", - "dia", - "dialah", - "dini", - "diri", - "dirinya", - "terdiri", - "dong", - "dulu", - "enggak", - "enggaknya", - "entah", - "entahlah", - "terhadap", - "terhadapnya", - "hal", - "hampir", - "hanya", - "hanyalah", - "harus", - "haruslah", - "harusnya", - "seharusnya", - "hendak", - "hendaklah", - "hendaknya", - "hingga", - "sehingga", - "ia", - "ialah", - "ibarat", - "ingin", - "inginkah", - "inginkan", - "ini", - "inikah", - "inilah", - "itu", - "itukah", - "itulah", - "jangan", - "jangankan", - "janganlah", - "jika", - "jikalau", - "juga", - "justru", - "kala", - "kalau", - "kalaulah", - "kalaupun", - "kalian", - "kami", - "kamilah", - "kamu", - "kamulah", - "kan", - "kapan", - "kapankah", - "kapanpun", - "dikarenakan", - "karena", - "karenanya", - "ke", - "kecil", - "kemudian", - "kenapa", - "kepada", - "kepadanya", - "ketika", - "seketika", - "khususnya", - "kini", - "kinilah", - "kiranya", - "sekiranya", - "kita", - "kitalah", - "kok", - "lagi", - "lagian", - "selagi", - "lah", - "lain", - "lainnya", - "melainkan", - "selaku", - "lalu", - "melalui", - "terlalu", - "lama", - "lamanya", - "selama", - "selama", - "selamanya", - "lebih", - "terlebih", - "bermacam", - "macam", - "semacam", - "maka", - "makanya", - "makin", - "malah", - "malahan", - "mampu", - "mampukah", - "mana", - "manakala", - "manalagi", - "masih", - "masihkah", - "semasih", - "masing", - "mau", - "maupun", - "semaunya", - "memang", - "mereka", - "merekalah", - "meski", - "meskipun", - "semula", - "mungkin", - "mungkinkah", - "nah", - "namun", - "nanti", - "nantinya", - "nyaris", - "oleh", - "olehnya", - "seorang", - "seseorang", - "pada", - "padanya", - "padahal", - "paling", - "sepanjang", - "pantas", - "sepantasnya", - "sepantasnyalah", - "para", - "pasti", - "pastilah", - "per", - "pernah", - "pula", - "pun", - "merupakan", - "rupanya", - "serupa", - "saat", - "saatnya", - "sesaat", - "saja", - "sajalah", - "saling", - "bersama", - "sama", - "sesama", - "sambil", - "sampai", - "sana", - "sangat", - "sangatlah", - "saya", - "sayalah", - "se", - "sebab", - "sebabnya", - "sebuah", - "tersebut", - "tersebutlah", - "sedang", - "sedangkan", - "sedikit", - "sedikitnya", - "segala", - "segalanya", - "segera", - "sesegera", - "sejak", - "sejenak", - "sekali", - "sekalian", - "sekalipun", - "sesekali", - "sekaligus", - "sekarang", - "sekarang", - "sekitar", - "sekitarnya", - "sela", - "selain", - "selalu", - "seluruh", - "seluruhnya", - "semakin", - "sementara", - "sempat", - "semua", - "semuanya", - "sendiri", - "sendirinya", - "seolah", - "seperti", - "sepertinya", - "sering", - "seringnya", - "serta", - "siapa", - "siapakah", - "siapapun", - "disini", - "disinilah", - "sini", - "sinilah", - "sesuatu", - "sesuatunya", - "suatu", - "sesudah", - "sesudahnya", - "sudah", - "sudahkah", - "sudahlah", - "supaya", - "tadi", - "tadinya", - "tak", - "tanpa", - "setelah", - "telah", - "tentang", - "tentu", - "tentulah", - "tentunya", - "tertentu", - "seterusnya", - "tapi", - "tetapi", - "setiap", - "tiap", - "setidaknya", - "tidak", - "tidakkah", - "tidaklah", - "toh", - "waduh", - "wah", - "wahai", - "sewaktu", - "walau", - "walaupun", - "wong", - "yaitu", - "yakni", - "yang" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/schema.xml deleted file mode 100644 index 5d7de3da2..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/schema.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/indonesian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json deleted file mode 100644 index 3b4f9865c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/_schema_analysis_stopwords_italian.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "ad", - "al", - "allo", - "ai", - "agli", - "all", - "agl", - "alla", - "alle", - "con", - "col", - "coi", - "da", - "dal", - "dallo", - "dai", - "dagli", - "dall", - "dagl", - "dalla", - "dalle", - "di", - "del", - "dello", - "dei", - "degli", - "dell", - "degl", - "della", - "delle", - "in", - "nel", - "nello", - "nei", - "negli", - "nell", - "negl", - "nella", - "nelle", - "su", - "sul", - "sullo", - "sui", - "sugli", - "sull", - "sugl", - "sulla", - "sulle", - "per", - "tra", - "contro", - "io", - "tu", - "lui", - "lei", - "noi", - "voi", - "loro", - "mio", - "mia", - "miei", - "mie", - "tuo", - "tua", - "tuoi", - "tue", - "suo", - "sua", - "suoi", - "sue", - "nostro", - "nostra", - "nostri", - "nostre", - "vostro", - "vostra", - "vostri", - "vostre", - "mi", - "ti", - "ci", - "vi", - "lo", - "la", - "li", - "le", - "gli", - "ne", - "il", - "un", - "uno", - "una", - "ma", - "ed", - "se", - "perché", - "anche", - "come", - "dov", - "dove", - "che", - "chi", - "cui", - "non", - "più", - "quale", - "quanto", - "quanti", - "quanta", - "quante", - "quello", - "quelli", - "quella", - "quelle", - "questo", - "questi", - "questa", - "queste", - "si", - "tutto", - "tutti", - "a", - "c", - "e", - "i", - "l", - "o", - "ho", - "hai", - "ha", - "abbiamo", - "avete", - "hanno", - "abbia", - "abbiate", - "abbiano", - "avrò", - "avrai", - "avrà", - "avremo", - "avrete", - "avranno", - "avrei", - "avresti", - "avrebbe", - "avremmo", - "avreste", - "avrebbero", - "avevo", - "avevi", - "aveva", - "avevamo", - "avevate", - "avevano", - "ebbi", - "avesti", - "ebbe", - "avemmo", - "aveste", - "ebbero", - "avessi", - "avesse", - "avessimo", - "avessero", - "avendo", - "avuto", - "avuta", - "avuti", - "avute", - "sono", - "sei", - "è", - "siamo", - "siete", - "sia", - "siate", - "siano", - "sarò", - "sarai", - "sarà", - "saremo", - "sarete", - "saranno", - "sarei", - "saresti", - "sarebbe", - "saremmo", - "sareste", - "sarebbero", - "ero", - "eri", - "era", - "eravamo", - "eravate", - "erano", - "fui", - "fosti", - "fu", - "fummo", - "foste", - "furono", - "fossi", - "fosse", - "fossimo", - "fossero", - "essendo", - "faccio", - "fai", - "facciamo", - "fanno", - "faccia", - "facciate", - "facciano", - "farò", - "farai", - "farà", - "faremo", - "farete", - "faranno", - "farei", - "faresti", - "farebbe", - "faremmo", - "fareste", - "farebbero", - "facevo", - "facevi", - "faceva", - "facevamo", - "facevate", - "facevano", - "feci", - "facesti", - "fece", - "facemmo", - "faceste", - "fecero", - "facessi", - "facesse", - "facessimo", - "facessero", - "facendo", - "sto", - "stai", - "sta", - "stiamo", - "stanno", - "stia", - "stiate", - "stiano", - "starò", - "starai", - "starà", - "staremo", - "starete", - "staranno", - "starei", - "staresti", - "starebbe", - "staremmo", - "stareste", - "starebbero", - "stavo", - "stavi", - "stava", - "stavamo", - "stavate", - "stavano", - "stetti", - "stesti", - "stette", - "stemmo", - "steste", - "stettero", - "stessi", - "stesse", - "stessimo", - "stessero", - "stando" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/schema.xml deleted file mode 100644 index 717ccbbbb..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/schema.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/italian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/_schema_analysis_stopwords_japanese.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/schema.xml deleted file mode 100644 index 4d594ff88..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/japanese/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/_schema_analysis_stopwords_khmer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/readme.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/schema.xml deleted file mode 100644 index 8f6f4f414..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/khmer/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/_schema_analysis_stopwords_korean.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/schema.xml deleted file mode 100644 index 9ee234f68..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/korean/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/_schema_analysis_stopwords_lao.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/readme.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/readme.txt deleted file mode 100644 index 6f096196b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -README - -Lucene provides support for segmenting Lao, Myanmar and Khmer into syllables with solr.ICUTokenizerFactory in the analysis-extras contrib module. -To use this tokenizer, see solr/contrib/analysis-extras/README.txt for instructions on which jars you need to add to your SOLR_HOME/lib diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/schema.xml deleted file mode 100644 index d56d68235..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/schema.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/lao/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json deleted file mode 100644 index 16358708c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/_schema_analysis_stopwords_norwegian.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "og", - "i", - "jeg", - "det", - "at", - "en", - "et", - "den", - "til", - "er", - "som", - "på", - "de", - "med", - "han", - "av", - "ikke", - "ikkje", - "der", - "så", - "var", - "meg", - "seg", - "men", - "ett", - "har", - "om", - "vi", - "min", - "mitt", - "ha", - "hadde", - "hun", - "nå", - "over", - "da", - "ved", - "fra", - "du", - "ut", - "sin", - "dem", - "oss", - "opp", - "man", - "kan", - "hans", - "hvor", - "eller", - "hva", - "skal", - "selv", - "sjøl", - "her", - "alle", - "vil", - "bli", - "ble", - "blei", - "blitt", - "kunne", - "inn", - "når", - "være", - "kom", - "noen", - "noe", - "ville", - "dere", - "som", - "deres", - "kun", - "ja", - "etter", - "ned", - "skulle", - "denne", - "for", - "deg", - "si", - "sine", - "sitt", - "mot", - "å", - "meget", - "hvorfor", - "dette", - "disse", - "uten", - "hvordan", - "ingen", - "din", - "ditt", - "blir", - "samme", - "hvilken", - "hvilke", - "sånn", - "inni", - "mellom", - "vår", - "hver", - "hvem", - "vors", - "hvis", - "både", - "bare", - "enn", - "fordi", - "før", - "mange", - "også", - "slik", - "vært", - "være", - "båe", - "begge", - "siden", - "dykk", - "dykkar", - "dei", - "deira", - "deires", - "deim", - "di", - "då", - "eg", - "ein", - "eit", - "eitt", - "elles", - "honom", - "hjå", - "ho", - "hoe", - "henne", - "hennar", - "hennes", - "hoss", - "hossen", - "ikkje", - "ingi", - "inkje", - "korleis", - "korso", - "kva", - "kvar", - "kvarhelst", - "kven", - "kvi", - "kvifor", - "me", - "medan", - "mi", - "mine", - "mykje", - "no", - "nokon", - "noka", - "nokor", - "noko", - "nokre", - "si", - "sia", - "sidan", - "so", - "somt", - "somme", - "um", - "upp", - "vere", - "vore", - "verte", - "vort", - "varte", - "vart" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/schema.xml deleted file mode 100644 index b775405e5..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/schema.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/norwegian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json deleted file mode 100644 index e01ce8743..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/_schema_analysis_stopwords_persian.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "انان", - "نداشته", - "سراسر", - "خياه", - "ايشان", - "وي", - "تاكنون", - "بيشتري", - "دوم", - "پس", - "ناشي", - "وگو", - "يا", - "داشتند", - "سپس", - "هنگام", - "هرگز", - "پنج", - "نشان", - "امسال", - "ديگر", - "گروهي", - "شدند", - "چطور", - "ده", - "و", - "دو", - "نخستين", - "ولي", - "چرا", - "چه", - "وسط", - "ه", - "كدام", - "قابل", - "يك", - "رفت", - "هفت", - "همچنين", - "در", - "هزار", - "بله", - "بلي", - "شايد", - "اما", - "شناسي", - "گرفته", - "دهد", - "داشته", - "دانست", - "داشتن", - "خواهيم", - "ميليارد", - "وقتيكه", - "امد", - "خواهد", - "جز", - "اورده", - "شده", - "بلكه", - "خدمات", - "شدن", - "برخي", - "نبود", - "بسياري", - "جلوگيري", - "حق", - "كردند", - "نوعي", - "بعري", - "نكرده", - "نظير", - "نبايد", - "بوده", - "بودن", - "داد", - "اورد", - "هست", - "جايي", - "شود", - "دنبال", - "داده", - "بايد", - "سابق", - "هيچ", - "همان", - "انجا", - "كمتر", - "كجاست", - "گردد", - "كسي", - "تر", - "مردم", - "تان", - "دادن", - "بودند", - "سري", - "جدا", - "ندارند", - "مگر", - "يكديگر", - "دارد", - "دهند", - "بنابراين", - "هنگامي", - "سمت", - "جا", - "انچه", - "خود", - "دادند", - "زياد", - "دارند", - "اثر", - "بدون", - "بهترين", - "بيشتر", - "البته", - "به", - "براساس", - "بيرون", - "كرد", - "بعضي", - "گرفت", - "توي", - "اي", - "ميليون", - "او", - "جريان", - "تول", - "بر", - "مانند", - "برابر", - "باشيم", - "مدتي", - "گويند", - "اكنون", - "تا", - "تنها", - "جديد", - "چند", - "بي", - "نشده", - "كردن", - "كردم", - "گويد", - "كرده", - "كنيم", - "نمي", - "نزد", - "روي", - "قصد", - "فقط", - "بالاي", - "ديگران", - "اين", - "ديروز", - "توسط", - "سوم", - "ايم", - "دانند", - "سوي", - "استفاده", - "شما", - "كنار", - "داريم", - "ساخته", - "طور", - "امده", - "رفته", - "نخست", - "بيست", - "نزديك", - "طي", - "كنيد", - "از", - "انها", - "تمامي", - "داشت", - "يكي", - "طريق", - "اش", - "چيست", - "روب", - "نمايد", - "گفت", - "چندين", - "چيزي", - "تواند", - "ام", - "ايا", - "با", - "ان", - "ايد", - "ترين", - "اينكه", - "ديگري", - "راه", - "هايي", - "بروز", - "همچنان", - "پاعين", - "كس", - "حدود", - "مختلف", - "مقابل", - "چيز", - "گيرد", - "ندارد", - "ضد", - "همچون", - "سازي", - "شان", - "مورد", - "باره", - "مرسي", - "خويش", - "برخوردار", - "چون", - "خارج", - "شش", - "هنوز", - "تحت", - "ضمن", - "هستيم", - "گفته", - "فكر", - "بسيار", - "پيش", - "براي", - "روزهاي", - "انكه", - "نخواهد", - "بالا", - "كل", - "وقتي", - "كي", - "چنين", - "كه", - "گيري", - "نيست", - "است", - "كجا", - "كند", - "نيز", - "يابد", - "بندي", - "حتي", - "توانند", - "عقب", - "خواست", - "كنند", - "بين", - "تمام", - "همه", - "ما", - "باشند", - "مثل", - "شد", - "اري", - "باشد", - "اره", - "طبق", - "بعد", - "اگر", - "صورت", - "غير", - "جاي", - "بيش", - "ريزي", - "اند", - "زيرا", - "چگونه", - "بار", - "لطفا", - "مي", - "درباره", - "من", - "ديده", - "همين", - "گذاري", - "برداري", - "علت", - "گذاشته", - "هم", - "فوق", - "نه", - "ها", - "شوند", - "اباد", - "همواره", - "هر", - "اول", - "خواهند", - "چهار", - "نام", - "امروز", - "مان", - "هاي", - "قبل", - "كنم", - "سعي", - "تازه", - "را", - "هستند", - "زير", - "جلوي", - "عنوان", - "بود" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/schema.xml deleted file mode 100644 index 571d2be67..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/schema.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/persian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json deleted file mode 100644 index 468b5820b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/_schema_analysis_stopwords_polish.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "a", - "aby", - "ach", - "acz", - "aczkolwiek", - "aj", - "albo", - "ale", - "ależ", - "aż", - "bardziej", - "bardzo", - "bez", - "bo", - "bowiem", - "by", - "byli", - "bynajmniej", - "być", - "był", - "była", - "było", - "były", - "będzie", - "będą", - "cali", - "cała", - "cały", - "ci", - "cię", - "ciebie", - "co", - "cokolwiek", - "coś", - "czasami", - "czasem", - "czemu", - "czy", - "czyli", - "daleko", - "dla", - "dlaczego", - "dlatego", - "do", - "dobrze", - "dokąd", - "dość", - "dużo", - "dwa", - "dwaj", - "dwie", - "dwoje", - "dziś", - "dzisiaj", - "gdy", - "gdyby", - "gdyż", - "gdzie", - "gdziekolwiek", - "gdzieś", - "go", - "i", - "ich", - "ile", - "im", - "inna", - "inne", - "inny", - "innych", - "iż", - "ja", - "ją", - "jak", - "jakaś", - "jakby", - "jaki", - "jakichś", - "jakie", - "jakiś", - "jakiż", - "jakkolwiek", - "jako", - "jakoś", - "je", - "jeden", - "jedna", - "jedno", - "jednak", - "jednakże", - "jego", - "jej", - "jemu", - "jest", - "jestem", - "jeszcze", - "jeśli", - "jeżeli", - "już", - "ją", - "każdy", - "kiedy", - "kilka", - "kimś", - "kto", - "ktokolwiek", - "ktoś", - "która", - "które", - "którego", - "której", - "który", - "których", - "którym", - "którzy", - "ku", - "lat", - "lecz", - "lub", - "ma", - "mają", - "mam", - "mi", - "mimo", - "między", - "mną", - "mnie", - "mogą", - "moi", - "moim", - "moja", - "moje", - "może", - "możliwe", - "można", - "mój", - "mu", - "musi", - "my", - "na", - "nad", - "nam", - "nami", - "nas", - "nasi", - "nasz", - "nasza", - "nasze", - "naszego", - "naszych", - "natomiast", - "natychmiast", - "nawet", - "nią", - "nic", - "nich", - "nie", - "niego", - "niej", - "niemu", - "nigdy", - "nim", - "nimi", - "niż", - "no", - "o", - "obok", - "od", - "około", - "on", - "ona", - "one", - "oni", - "ono", - "oraz", - "oto", - "owszem", - "pan", - "pana", - "pani", - "po", - "pod", - "podczas", - "pomimo", - "ponad", - "ponieważ", - "powinien", - "powinna", - "powinni", - "powinno", - "poza", - "prawie", - "przecież", - "przed", - "przede", - "przedtem", - "przez", - "przy", - "roku", - "również", - "sam", - "sama", - "są", - "się", - "skąd", - "sobie", - "sobą", - "sposób", - "swoje", - "ta", - "tak", - "taka", - "taki", - "takie", - "także", - "tam", - "te", - "tego", - "tej", - "ten", - "teraz", - "też", - "to", - "tobą", - "tobie", - "toteż", - "trzeba", - "tu", - "tutaj", - "twoi", - "twoim", - "twoja", - "twoje", - "twym", - "twój", - "ty", - "tych", - "tylko", - "tym", - "u", - "w", - "wam", - "wami", - "was", - "wasz", - "wasza", - "wasze", - "we", - "według", - "wiele", - "wielu", - "więc", - "więcej", - "wszyscy", - "wszystkich", - "wszystkie", - "wszystkim", - "wszystko", - "wtedy", - "wy", - "właśnie", - "z", - "za", - "zapewne", - "zawsze", - "ze", - "znowu", - "znów", - "został", - "żaden", - "żadna", - "żadne", - "żadnych", - "że", - "żeby" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/protwords.txt deleted file mode 100644 index c0be26e39..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/protwords.txt +++ /dev/null @@ -1,17 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/schema.xml deleted file mode 100644 index 158511028..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/schema.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/polish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json deleted file mode 100644 index 6ba584855..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/_schema_analysis_stopwords_portuguese.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "a", - "o", - "que", - "e", - "do", - "da", - "em", - "um", - "para", - "com", - "não", - "uma", - "os", - "no", - "se", - "na", - "por", - "mais", - "as", - "dos", - "como", - "mas", - "ao", - "ele", - "das", - "à", - "seu", - "sua", - "ou", - "quando", - "muito", - "nos", - "já", - "eu", - "também", - "só", - "pelo", - "pela", - "até", - "isso", - "ela", - "entre", - "depois", - "sem", - "mesmo", - "aos", - "seus", - "quem", - "nas", - "me", - "esse", - "eles", - "você", - "essa", - "num", - "nem", - "suas", - "meu", - "às", - "minha", - "numa", - "pelos", - "elas", - "qual", - "nós", - "lhe", - "deles", - "essas", - "esses", - "pelas", - "este", - "dele", - "tu", - "te", - "vocês", - "vos", - "lhes", - "meus", - "minhas", - "teu", - "tua", - "teus", - "tuas", - "nosso", - "nossa", - "nossos", - "nossas", - "dela", - "delas", - "esta", - "estes", - "estas", - "aquele", - "aquela", - "aqueles", - "aquelas", - "isto", - "aquilo", - "estou", - "está", - "estamos", - "estão", - "estive", - "esteve", - "estivemos", - "estiveram", - "estava", - "estávamos", - "estavam", - "estivera", - "estivéramos", - "esteja", - "estejamos", - "estejam", - "estivesse", - "estivéssemos", - "estivessem", - "estiver", - "estivermos", - "estiverem", - "hei", - "há", - "havemos", - "hão", - "houve", - "houvemos", - "houveram", - "houvera", - "houvéramos", - "haja", - "hajamos", - "hajam", - "houvesse", - "houvéssemos", - "houvessem", - "houver", - "houvermos", - "houverem", - "houverei", - "houverá", - "houveremos", - "houverão", - "houveria", - "houveríamos", - "houveriam", - "sou", - "somos", - "são", - "era", - "éramos", - "eram", - "fui", - "foi", - "fomos", - "foram", - "fora", - "fôramos", - "seja", - "sejamos", - "sejam", - "fosse", - "fôssemos", - "fossem", - "for", - "formos", - "forem", - "serei", - "será", - "seremos", - "serão", - "seria", - "seríamos", - "seriam", - "tenho", - "tem", - "temos", - "tém", - "tinha", - "tínhamos", - "tinham", - "tive", - "teve", - "tivemos", - "tiveram", - "tivera", - "tivéramos", - "tenha", - "tenhamos", - "tenham", - "tivesse", - "tivéssemos", - "tivessem", - "tiver", - "tivermos", - "tiverem", - "terei", - "terá", - "teremos", - "terão", - "teria", - "teríamos", - "teriam" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/schema.xml deleted file mode 100644 index 481f07e99..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/schema.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/synonyms.txt deleted file mode 100644 index 632aadf0d..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/portuguese/synonyms.txt +++ /dev/null @@ -1,16 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json deleted file mode 100644 index 639df83c3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/_schema_analysis_stopwords_romanian.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "acea", - "aceasta", - "această", - "aceea", - "acei", - "aceia", - "acel", - "acela", - "acele", - "acelea", - "acest", - "acesta", - "aceste", - "acestea", - "aceşti", - "aceştia", - "acolo", - "acum", - "ai", - "aia", - "aibă", - "aici", - "al", - "ăla", - "ale", - "alea", - "ălea", - "altceva", - "altcineva", - "am", - "ar", - "are", - "aş", - "aşadar", - "asemenea", - "asta", - "ăsta", - "astăzi", - "astea", - "ăstea", - "ăştia", - "asupra", - "aţi", - "au", - "avea", - "avem", - "aveţi", - "azi", - "bine", - "bucur", - "bună", - "ca", - "că", - "căci", - "când", - "care", - "cărei", - "căror", - "cărui", - "cât", - "câte", - "câţi", - "către", - "câtva", - "ce", - "cel", - "ceva", - "chiar", - "cînd", - "cine", - "cineva", - "cît", - "cîte", - "cîţi", - "cîtva", - "contra", - "cu", - "cum", - "cumva", - "curând", - "curînd", - "da", - "dă", - "dacă", - "dar", - "datorită", - "de", - "deci", - "deja", - "deoarece", - "departe", - "deşi", - "din", - "dinaintea", - "dintr", - "dintre", - "drept", - "după", - "ea", - "ei", - "el", - "ele", - "eram", - "este", - "eşti", - "eu", - "face", - "fără", - "fi", - "fie", - "fiecare", - "fii", - "fim", - "fiţi", - "iar", - "ieri", - "îi", - "îl", - "îmi", - "împotriva", - "în", - "înainte", - "înaintea", - "încât", - "încît", - "încotro", - "între", - "întrucât", - "întrucît", - "îţi", - "la", - "lângă", - "le", - "li", - "lîngă", - "lor", - "lui", - "mă", - "mâine", - "mea", - "mei", - "mele", - "mereu", - "meu", - "mi", - "mine", - "mult", - "multă", - "mulţi", - "ne", - "nicăieri", - "nici", - "nimeni", - "nişte", - "noastră", - "noastre", - "noi", - "noştri", - "nostru", - "nu", - "ori", - "oricând", - "oricare", - "oricât", - "orice", - "oricînd", - "oricine", - "oricît", - "oricum", - "oriunde", - "până", - "pe", - "pentru", - "peste", - "pînă", - "poate", - "pot", - "prea", - "prima", - "primul", - "prin", - "printr", - "sa", - "să", - "săi", - "sale", - "sau", - "său", - "se", - "şi", - "sînt", - "sîntem", - "sînteţi", - "spre", - "sub", - "sunt", - "suntem", - "sunteţi", - "ta", - "tăi", - "tale", - "tău", - "te", - "ţi", - "ţie", - "tine", - "toată", - "toate", - "tot", - "toţi", - "totuşi", - "tu", - "un", - "una", - "unde", - "undeva", - "unei", - "unele", - "uneori", - "unor", - "vă", - "vi", - "voastră", - "voastre", - "voi", - "voştri", - "vostru", - "vouă", - "vreo", - "vreun" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/schema.xml deleted file mode 100644 index a0634ae60..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/schema.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/romanian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json deleted file mode 100644 index f0b3051b4..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/_schema_analysis_stopwords_russian.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "и", - "в", - "во", - "не", - "что", - "он", - "на", - "я", - "с", - "со", - "как", - "а", - "то", - "все", - "она", - "так", - "его", - "но", - "да", - "ты", - "к", - "у", - "же", - "вы", - "за", - "бы", - "по", - "только", - "ее", - "мне", - "было", - "вот", - "от", - "меня", - "еще", - "нет", - "о", - "из", - "ему", - "теперь", - "когда", - "даже", - "ну", - "вдруг", - "ли", - "если", - "уже", - "или", - "ни", - "быть", - "был", - "него", - "до", - "вас", - "нибудь", - "опять", - "уж", - "вам", - "сказал", - "ведь", - "там", - "потом", - "себя", - "ничего", - "ей", - "может", - "они", - "тут", - "где", - "есть", - "надо", - "ней", - "для", - "мы", - "тебя", - "их", - "чем", - "была", - "сам", - "чтоб", - "без", - "будто", - "человек", - "чего", - "раз", - "тоже", - "себе", - "под", - "жизнь", - "будет", - "ж", - "тогда", - "кто", - "этот", - "говорил", - "того", - "потому", - "этого", - "какой", - "совсем", - "ним", - "здесь", - "этом", - "один", - "почти", - "мой", - "тем", - "чтобы", - "нее", - "кажется", - "сейчас", - "были", - "куда", - "зачем", - "сказать", - "всех", - "никогда", - "сегодня", - "можно", - "при", - "наконец", - "два", - "об", - "другой", - "хоть", - "после", - "над", - "больше", - "тот", - "через", - "эти", - "нас", - "про", - "всего", - "них", - "какая", - "много", - "разве", - "сказала", - "три", - "эту", - "моя", - "впрочем", - "хорошо", - "свою", - "этой", - "перед", - "иногда", - "лучше", - "чуть", - "том", - "нельзя", - "такой", - "им", - "более", - "всегда", - "конечно", - "всю", - "между" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/schema.xml deleted file mode 100644 index bc6ce1bcc..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/russian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/solrconfig.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/solrconfig.xml deleted file mode 100644 index db6265bd2..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/solrconfig.xml +++ /dev/null @@ -1,549 +0,0 @@ - - - - - 4.10.4 - - - ${solr.abortOnConfigurationError:true} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - native - true - - - - - - - ${solr.data.dir:} - - - - 100 - 3600000 - true - - - - - 1000 - - - - - - 1024 - - - - - - - - true - - 50 - - 200 - - - - - - - - - - - - - - - false - - 5 - - - - - - - - - - - - - - - edismax - explicit - content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0 - content^2.0 - content - 15 - - 2<-35% - - title,content - 3 - true - true - - content - 200 - - false - false - false - 1 - default - wordbreak - - json - true - - - - spellcheck - elevator - - - - - - - true - json - true - - - - - - - explicit - - - velocity - - browse - layout - Solritas - - content - edismax - *:* - 10 - *,score - content^0.5 title^1.2 keywords^2.0 - content,title,keywords - 3 - - content^40.0 title^5.0 keywords^2.0 tagsH1^5.0 tagsH2H3^3.0 tagsH4H5H6^2.0 tagsInline^1.0 - - on - type - site - author - keywords - fileMimeType - appKey - 1 - - true - true - - - on - title content - html - <b> - </b> - - - spellcheck - - - - - - - 1 - 1 - 3 - 15 - 20 - false - - - - - - - - - - - - - - - - - - - - - true - - - termsComponent - - - - - - - explicit - - - elevator - - - - - - - - - - solrpingquery - - - all - id - - - - - - - explicit - true - - - - - - - - - - - - - - - true - default - true - - name - id - - features - - true - - - - false - - - clusteringComponent - - - - - - - - default - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - 20 - - - - stc - org.carrot2.clustering.stc.STCClusteringAlgorithm - - - - - - textSpell - - - default - spell - solr.DirectSolrSpellChecker - internal - 0.5 - 2 - 1 - 5 - 3 - 0.01 - - - - - wordbreak - solr.WordBreakSolrSpellChecker - spell - - - - - - - - - string - elevate.xml - true - - - - - - - - - - 100 - - - - - - - 70 - 0.5 - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - ,, - ,, - ,, - ,, - , - ]]> - - ]]> - - - - - - - - 60 - endtime - - - - - - - - - - - - 5 - - - - - - - - - - html - - - - - - - - *:* - - - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json deleted file mode 100644 index bb07f37f6..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/_schema_analysis_stopwords_spanish.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "de", - "la", - "que", - "el", - "en", - "y", - "a", - "los", - "del", - "se", - "las", - "por", - "un", - "para", - "con", - "no", - "una", - "su", - "al", - "lo", - "como", - "más", - "pero", - "sus", - "le", - "ya", - "o", - "este", - "sí", - "porque", - "esta", - "entre", - "cuando", - "muy", - "sin", - "sobre", - "también", - "me", - "hasta", - "hay", - "donde", - "quien", - "desde", - "todo", - "nos", - "durante", - "todos", - "uno", - "les", - "ni", - "contra", - "otros", - "ese", - "eso", - "ante", - "ellos", - "e", - "esto", - "mí", - "antes", - "algunos", - "qué", - "unos", - "yo", - "otro", - "otras", - "otra", - "él", - "tanto", - "esa", - "estos", - "mucho", - "quienes", - "nada", - "muchos", - "cual", - "poco", - "ella", - "estar", - "estas", - "algunas", - "algo", - "nosotros", - "mi", - "mis", - "tú", - "te", - "ti", - "tu", - "tus", - "ellas", - "nosotras", - "vosotros", - "vosotras", - "os", - "mío", - "mía", - "míos", - "mías", - "tuyo", - "tuya", - "tuyos", - "tuyas", - "suyo", - "suya", - "suyos", - "suyas", - "nuestro", - "nuestra", - "nuestros", - "nuestras", - "vuestro", - "vuestra", - "vuestros", - "vuestras", - "esos", - "esas", - "estoy", - "estás", - "está", - "estamos", - "estáis", - "están", - "esté", - "estés", - "estemos", - "estéis", - "estén", - "estaré", - "estarás", - "estará", - "estaremos", - "estaréis", - "estarán", - "estaría", - "estarías", - "estaríamos", - "estaríais", - "estarían", - "estaba", - "estabas", - "estábamos", - "estabais", - "estaban", - "estuve", - "estuviste", - "estuvo", - "estuvimos", - "estuvisteis", - "estuvieron", - "estuviera", - "estuvieras", - "estuviéramos", - "estuvierais", - "estuvieran", - "estuviese", - "estuvieses", - "estuviésemos", - "estuvieseis", - "estuviesen", - "estando", - "estado", - "estada", - "estados", - "estadas", - "estad", - "he", - "has", - "ha", - "hemos", - "habéis", - "han", - "haya", - "hayas", - "hayamos", - "hayáis", - "hayan", - "habré", - "habrás", - "habrá", - "habremos", - "habréis", - "habrán", - "habría", - "habrías", - "habríamos", - "habríais", - "habrían", - "había", - "habías", - "habíamos", - "habíais", - "habían", - "hube", - "hubiste", - "hubo", - "hubimos", - "hubisteis", - "hubieron", - "hubiera", - "hubieras", - "hubiéramos", - "hubierais", - "hubieran", - "hubiese", - "hubieses", - "hubiésemos", - "hubieseis", - "hubiesen", - "habiendo", - "habido", - "habida", - "habidos", - "habidas", - "soy", - "eres", - "es", - "somos", - "sois", - "son", - "sea", - "seas", - "seamos", - "seáis", - "sean", - "seré", - "serás", - "será", - "seremos", - "seréis", - "serán", - "sería", - "serías", - "seríamos", - "seríais", - "serían", - "era", - "eras", - "éramos", - "erais", - "eran", - "fui", - "fuiste", - "fue", - "fuimos", - "fuisteis", - "fueron", - "fuera", - "fueras", - "fuéramos", - "fuerais", - "fueran", - "fuese", - "fueses", - "fuésemos", - "fueseis", - "fuesen", - "siendo", - "sido", - "tengo", - "tienes", - "tiene", - "tenemos", - "tenéis", - "tienen", - "tenga", - "tengas", - "tengamos", - "tengáis", - "tengan", - "tendré", - "tendrás", - "tendrá", - "tendremos", - "tendréis", - "tendrán", - "tendría", - "tendrías", - "tendríamos", - "tendríais", - "tendrían", - "tenía", - "tenías", - "teníamos", - "teníais", - "tenían", - "tuve", - "tuviste", - "tuvo", - "tuvimos", - "tuvisteis", - "tuvieron", - "tuviera", - "tuvieras", - "tuviéramos", - "tuvierais", - "tuvieran", - "tuviese", - "tuvieses", - "tuviésemos", - "tuvieseis", - "tuviesen", - "teniendo", - "tenido", - "tenida", - "tenidos", - "tenidas", - "tened" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/schema.xml deleted file mode 100644 index b236ddbe0..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/schema.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/spanish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json deleted file mode 100644 index 919377766..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/_schema_analysis_stopwords_swedish.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "och", - "det", - "att", - "i", - "en", - "jag", - "hon", - "som", - "han", - "på", - "den", - "med", - "var", - "sig", - "för", - "så", - "till", - "är", - "men", - "ett", - "om", - "hade", - "de", - "av", - "icke", - "mig", - "du", - "henne", - "då", - "sin", - "nu", - "har", - "inte", - "hans", - "honom", - "skulle", - "hennes", - "där", - "min", - "man", - "ej", - "vid", - "kunde", - "något", - "från", - "ut", - "när", - "efter", - "upp", - "vi", - "dem", - "vara", - "vad", - "över", - "än", - "dig", - "kan", - "sina", - "här", - "ha", - "mot", - "alla", - "under", - "någon", - "eller", - "allt", - "mycket", - "sedan", - "ju", - "denna", - "själv", - "detta", - "åt", - "utan", - "varit", - "hur", - "ingen", - "mitt", - "ni", - "bli", - "blev", - "oss", - "din", - "dessa", - "några", - "deras", - "blir", - "mina", - "samma", - "vilken", - "er", - "sådan", - "vår", - "blivit", - "dess", - "inom", - "mellan", - "sådant", - "varför", - "varje", - "vilka", - "ditt", - "vem", - "vilket", - "sitta", - "sådana", - "vart", - "dina", - "vars", - "vårt", - "våra", - "ert", - "era", - "vilkas" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/schema.xml deleted file mode 100644 index f5e925ced..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/schema.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/swedish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json deleted file mode 100644 index 89d37acf3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/_schema_analysis_stopwords_thai.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/schema.xml deleted file mode 100644 index a2ae18e84..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/schema.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/synonyms.txt deleted file mode 100644 index 8b1378917..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/thai/synonyms.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json deleted file mode 100644 index 2075844aa..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/_schema_analysis_stopwords_turkish.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "acaba", - "altmış", - "altı", - "ama", - "ancak", - "arada", - "aslında", - "ayrıca", - "bana", - "bazı", - "belki", - "ben", - "benden", - "beni", - "benim", - "beri", - "beş", - "bile", - "bin", - "bir", - "birçok", - "biri", - "birkaç", - "birkez", - "birşey", - "birşeyi", - "biz", - "bize", - "bizden", - "bizi", - "bizim", - "böyle", - "böylece", - "bu", - "buna", - "bunda", - "bundan", - "bunlar", - "bunları", - "bunların", - "bunu", - "bunun", - "burada", - "çok", - "çünkü", - "da", - "daha", - "dahi", - "de", - "defa", - "değil", - "diğer", - "diye", - "doksan", - "dokuz", - "dolayı", - "dolayısıyla", - "dört", - "edecek", - "eden", - "ederek", - "edilecek", - "ediliyor", - "edilmesi", - "ediyor", - "eğer", - "elli", - "en", - "etmesi", - "etti", - "ettiği", - "ettiğini", - "gibi", - "göre", - "halen", - "hangi", - "hatta", - "hem", - "henüz", - "hep", - "hepsi", - "her", - "herhangi", - "herkesin", - "hiç", - "hiçbir", - "için", - "iki", - "ile", - "ilgili", - "ise", - "işte", - "itibaren", - "itibariyle", - "kadar", - "karşın", - "katrilyon", - "kendi", - "kendilerine", - "kendini", - "kendisi", - "kendisine", - "kendisini", - "kez", - "ki", - "kim", - "kimden", - "kime", - "kimi", - "kimse", - "kırk", - "milyar", - "milyon", - "mu", - "mü", - "mı", - "nasıl", - "ne", - "neden", - "nedenle", - "nerde", - "nerede", - "nereye", - "niye", - "niçin", - "o", - "olan", - "olarak", - "oldu", - "olduğu", - "olduğunu", - "olduklarını", - "olmadı", - "olmadığı", - "olmak", - "olması", - "olmayan", - "olmaz", - "olsa", - "olsun", - "olup", - "olur", - "olursa", - "oluyor", - "on", - "ona", - "ondan", - "onlar", - "onlardan", - "onları", - "onların", - "onu", - "onun", - "otuz", - "oysa", - "öyle", - "pek", - "rağmen", - "sadece", - "sanki", - "sekiz", - "seksen", - "sen", - "senden", - "seni", - "senin", - "siz", - "sizden", - "sizi", - "sizin", - "şey", - "şeyden", - "şeyi", - "şeyler", - "şöyle", - "şu", - "şuna", - "şunda", - "şundan", - "şunları", - "şunu", - "tarafından", - "trilyon", - "tüm", - "üç", - "üzere", - "var", - "vardı", - "ve", - "veya", - "ya", - "yani", - "yapacak", - "yapılan", - "yapılması", - "yapıyor", - "yapmak", - "yaptı", - "yaptığı", - "yaptığını", - "yaptıkları", - "yedi", - "yerine", - "yetmiş", - "yine", - "yirmi", - "yoksa", - "yüz", - "zaten" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/schema.xml deleted file mode 100644 index 046ca501f..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/schema.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/turkish/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json b/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json deleted file mode 100644 index f0b3051b4..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/_schema_analysis_stopwords_ukrainian.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "initArgs": { - "ignoreCase": true - }, - "initializedOn": "2014-04-29T23:08:58.000Z", - "managedList": [ - "и", - "в", - "во", - "не", - "что", - "он", - "на", - "я", - "с", - "со", - "как", - "а", - "то", - "все", - "она", - "так", - "его", - "но", - "да", - "ты", - "к", - "у", - "же", - "вы", - "за", - "бы", - "по", - "только", - "ее", - "мне", - "было", - "вот", - "от", - "меня", - "еще", - "нет", - "о", - "из", - "ему", - "теперь", - "когда", - "даже", - "ну", - "вдруг", - "ли", - "если", - "уже", - "или", - "ни", - "быть", - "был", - "него", - "до", - "вас", - "нибудь", - "опять", - "уж", - "вам", - "сказал", - "ведь", - "там", - "потом", - "себя", - "ничего", - "ей", - "может", - "они", - "тут", - "где", - "есть", - "надо", - "ней", - "для", - "мы", - "тебя", - "их", - "чем", - "была", - "сам", - "чтоб", - "без", - "будто", - "человек", - "чего", - "раз", - "тоже", - "себе", - "под", - "жизнь", - "будет", - "ж", - "тогда", - "кто", - "этот", - "говорил", - "того", - "потому", - "этого", - "какой", - "совсем", - "ним", - "здесь", - "этом", - "один", - "почти", - "мой", - "тем", - "чтобы", - "нее", - "кажется", - "сейчас", - "были", - "куда", - "зачем", - "сказать", - "всех", - "никогда", - "сегодня", - "можно", - "при", - "наконец", - "два", - "об", - "другой", - "хоть", - "после", - "над", - "больше", - "тот", - "через", - "эти", - "нас", - "про", - "всего", - "них", - "какая", - "много", - "разве", - "сказала", - "три", - "эту", - "моя", - "впрочем", - "хорошо", - "свою", - "этой", - "перед", - "иногда", - "лучше", - "чуть", - "том", - "нельзя", - "такой", - "им", - "более", - "всегда", - "конечно", - "всю", - "между" - ] -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/protwords.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/protwords.txt deleted file mode 100644 index 391c6f81c..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/protwords.txt +++ /dev/null @@ -1 +0,0 @@ -TYPO3 \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/schema.xml b/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/schema.xml deleted file mode 100644 index ed2f81e37..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/schema.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/synonyms.txt b/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/synonyms.txt deleted file mode 100644 index 3057a583b..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/ukrainian/synonyms.txt +++ /dev/null @@ -1,17 +0,0 @@ -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/VM_global_library.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/VM_global_library.vm deleted file mode 100644 index 3dd880c46..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/VM_global_library.vm +++ /dev/null @@ -1,161 +0,0 @@ - -#macro(param $key)$request.params.get($key)#end - -#macro(url_for_solr)/solr#if($request.core.name != "")/$request.core.name#end#end -#macro(url_for_home)#url_for_solr/browse#end - -#macro(q)&q=$!{esc.url($params.get('q'))}#end - -#macro(fqs $p)#foreach($fq in $p)#if($velocityCount>1)&#{end}fq=$esc.url($fq)#end#end - -#macro(debug)#if($request.params.get('debugQuery'))&debugQuery=true#end#end - -#macro(boostPrice)#if($request.params.get('bf') == 'price')&bf=price#end#end - -#macro(annotate)#if($request.params.get('annotateBrowse'))&annotateBrowse=true#end#end - -#macro(annTitle $msg)#if($annotate == true)title="$msg"#end#end - -#macro(spatial)#if($request.params.get('sfield'))&sfield=store#end#if($request.params.get('pt'))&pt=$request.params.get('pt')#end#if($request.params.get('d'))&d=$request.params.get('d')#end#end - -#macro(qOpts)#set($queryOpts = $request.params.get("queryOpts"))#if($queryOpts && $queryOpts != "")&queryOpts=$queryOpts#end#end - -#macro(group)#if($request.params.getBool("group") == true)&group=true#end#if($request.params.get("group.field"))#foreach($grp in $request.params.getParams('group.field'))&group.field=$grp#end#end#end - -#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#debug#boostPrice#annotate#spatial#qOpts#group#end -#macro(lens)#lensNoQ#q#end - - -#macro(url_for_lens)#{url_for_home}#lens#end - -#macro(url_for_start $start)#url_for_home#lens&start=$start#end - -#macro(url_for_filters $p)#url_for_home?#q#boostPrice#spatial#qOpts#if($list.size($p) > 0)&#fqs($p)#end#debug#end - - -#macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end - -## TODO: convert to use {!raw f=$field}$value (with escaping of course) -#macro(url_for_facet_filter $field $value)#url_for_home#lens&fq=$esc.url($field):%22$esc.url($value)%22#end - -#macro(url_for_facet_date_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end - -#macro(url_for_facet_range_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end - - -#macro(link_to_previous_page $text) - #if($page.current_page_number > 1) - #set($prev_start = $page.start - $page.results_per_page) - $text - #end -#end - -#macro(link_to_next_page $text) - #if($page.current_page_number < $page.page_count) - #set($next_start = $page.start + $page.results_per_page) - $text - #end -#end - -#macro(link_to_page $page_number $text) - #if($page_number == $page.current_page_number) - $text - #else - #if($page_number <= $page.page_count) - #set($page_start = $page_number * $page.results_per_page - $page.results_per_page) - $text - #end - #end -#end - -#macro(display_facet_query $field, $display, $fieldName) - #if($field.size() > 0) - $display -
    - #foreach ($facet in $field) - #if ($facet.value > 0) - #set($facetURL = "#url_for_nested_facet_query($facet.key)") - #if ($facetURL != '') -
  • $facet.key ($facet.value)
    • - #end - #end - #end -
- #end -#end - - -#macro(display_facet_range $field, $display, $fieldName, $start, $end, $gap, $before, $after) - $display -
    - #if($before && $before != "") - #set($value = "[* TO " + "#format_value($start)" + "]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") -
  • Less than #format_value($start) ($before)
    • - #end - #foreach ($facet in $field) - #set($rangeEnd = "#range_get_to_value($facet.key, $gap)") - #set($value = "[" + $facet.key + " TO " + $rangeEnd + "]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") - #if ($facetURL != '') -
  • $facet.key - #format_value($rangeEnd) ($facet.value)
    • - #end - #end - #if($end && $end != "" && $after > 0) - #set($value = "[" + "#format_value($end)" + " TO *]") - #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") -
  • More than #format_value($end) ($after)
    • - #end -
-#end - -## $pivots is a list of facet_pivot -#macro(display_facet_pivot $pivots, $display) - #if($pivots.size() > 0) - $display - - #end -#end - -#macro(field $f) - #if($response.response.highlighting.get($docId).get($f).get(0)) - $!response.response.highlighting.get($docId).get($f).get(0) - #else - #foreach($v in $doc.getFieldValues($f)) - $v - #end - #end -#end - -#macro(utc_date $theDate) -$date.format("yyyy-MM-dd'T'HH:mm:ss'Z'",$theDate,$date.getLocale(),$date.getTimeZone().getTimeZone("UTC"))## -#end - -#macro(format_value $val) -#if(${val.class.name} == "java.util.Date") -#utc_date($val)## -#else -$val## -#end -#end - -#macro(range_get_to_value $inval, $gapval) -#if(${gapval.class.name} == "java.lang.String") -$inval$gapval## -#elseif(${gapval.class.name} == "java.lang.Float" || ${inval.class.name} == "java.lang.Float") -$math.toDouble($math.add($inval,$gapval))## -#else -$math.add($inval,$gapval)## -#end -#end \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/browse.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/browse.vm deleted file mode 100644 index d7c3c4352..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/browse.vm +++ /dev/null @@ -1,45 +0,0 @@ -#set($searcher=$request.searcher) -#set($params=$request.params) -#set($clusters = $response.response.clusters) -#set($mltResults = $response.response.get("moreLikeThis")) -#set($annotate = $params.get("annotateBrowse")) -#parse('query.vm') -#if($response.response.spellcheck.suggestions and $response.response.spellcheck.suggestions.size() > 0) - Did you mean $response.response.spellcheck.suggestions.collation? -#end - -
- #parse("facets.vm") -
- - - -
- #if($response.response.get('grouped')) - #foreach($grouping in $response.response.get('grouped')) - #parse("hitGrouped.vm") - #end - #else - #foreach($doc in $response.results) - #parse("hit.vm") - #end - #end -
- - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/doc.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/doc.vm deleted file mode 100644 index a9bc3fcd3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/doc.vm +++ /dev/null @@ -1,39 +0,0 @@ -
#field('title')#if($params.getBool('mlt', false) == false)More Like This#end
-
Content: #field('content')
-
Keywords: #field('keywords')
-
Author: #field('author')
-
- #set($mlt = $mltResults.get($docId)) - #set($mltOn = $params.getBool('mlt')) - #if($mltOn == true)
Similar Items
#end - #if ($mltOn && $mlt && $mlt.size() > 0) -
    - #foreach($mltHit in $mlt) - #set($mltId = $mltHit.getFieldValue('id')) -
  • -
    Title: $mltHit.getFieldValue('title')
    -
    Content: $mltHit.getFieldValue('content') -
    • - #end -
- #elseif($mltOn && $mlt.size() == 0) -
No Similar Items Found
- #end -
-#if($params.getBool("debugQuery",false)) - toggle explain - 
$response.getExplainMap().get($doc.getFirstValue('id'))
- toggle all fields - - #foreach($fieldname in $doc.fieldNames) -
- $fieldname : - - #foreach($value in $doc.getFieldValues($fieldname)) - $value - #end - - #end -
- -#end \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facet_fields.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facet_fields.vm deleted file mode 100644 index 7b9d427d2..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facet_fields.vm +++ /dev/null @@ -1,12 +0,0 @@ -#if($response.facetFields) -

Facets

- #foreach($field in $response.facetFields) - $field.name - -
    - #foreach($facet in $field.values) -
  • $facet.name ($facet.count)
    • - #end -
- #end - #end \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facets.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facets.vm deleted file mode 100644 index 98c92eba5..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/facets.vm +++ /dev/null @@ -1 +0,0 @@ -#parse('facet_fields.vm') diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/footer.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/footer.vm deleted file mode 100644 index 90f61cef5..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/footer.vm +++ /dev/null @@ -1,16 +0,0 @@ -
-
- Options: - #if($request.params.get('debugQuery')) - disable debug - #else - enable debug - #end - #if($annotate) - disable annotation - #else - enable annotation - #end - XML
- -
Documentation: Solr Home Page, Solr Wiki
diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/head.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/head.vm deleted file mode 100644 index 8b4154222..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/head.vm +++ /dev/null @@ -1,45 +0,0 @@ - - ## An example of using an arbitrary request parameter - - -#param('title') - - - - - - - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/header.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/header.vm deleted file mode 100644 index 15c3870a0..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/header.vm +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hit.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hit.vm deleted file mode 100644 index 5cd4fe8d8..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hit.vm +++ /dev/null @@ -1,5 +0,0 @@ -#set($docId = $doc.getFieldValue('id')) - -
- #parse("doc.vm") -
diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hitGrouped.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hitGrouped.vm deleted file mode 100644 index c3cccf4b3..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/hitGrouped.vm +++ /dev/null @@ -1,18 +0,0 @@ -
-
$grouping.key
-
Total Matches in Group: $grouping.value.matches
-
#foreach ($group in $grouping.value.groups) -
$group.groupValue ($group.doclist.numFound)
-
- #foreach ($doc in $group.doclist) - #set($docId = $doc.getFieldValue('id')) - #parse("doc.vm") - #end -
- #end
-
- #if($params.getBool("debugQuery",false)) - toggle explain - 
$response.getExplainMap().get($doc.getFirstValue('id'))
- #end - diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.css b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.css deleted file mode 100644 index 91b622833..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.css +++ /dev/null @@ -1,48 +0,0 @@ -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url('indicator.gif') right center no-repeat; -} - -.ac_odd { - background-color: #eee; -} - -.ac_over { - background-color: #0A246A; - color: white; -} diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.js b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.js deleted file mode 100644 index f1b2642e7..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/jquery.autocomplete.js +++ /dev/null @@ -1,762 +0,0 @@ -/* - * Autocomplete - jQuery plugin 1.1pre - * - * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Revision: $Id: jquery.autocomplete.js 5785 2008-07-12 10:37:33Z joern.zaefferer $ - * - */ - -;(function($) { - -$.fn.extend({ - autocomplete: function(urlOrData, options) { - var isUrl = typeof urlOrData == "string"; - options = $.extend({}, $.Autocompleter.defaults, { - url: isUrl ? urlOrData : null, - data: isUrl ? null : urlOrData, - delay: isUrl ? $.Autocompleter.defaults.delay : 10, - max: options && !options.scroll ? 10 : 150 - }, options); - - // if highlight is set to false, replace it with a do-nothing function - options.highlight = options.highlight || function(value) { return value; }; - - // if the formatMatch option is not specified, then use formatItem for backwards compatibility - options.formatMatch = options.formatMatch || options.formatItem; - - return this.each(function() { - new $.Autocompleter(this, options); - }); - }, - result: function(handler) { - return this.bind("result", handler); - }, - search: function(handler) { - return this.trigger("search", [handler]); - }, - flushCache: function() { - return this.trigger("flushCache"); - }, - setOptions: function(options){ - return this.trigger("setOptions", [options]); - }, - unautocomplete: function() { - return this.trigger("unautocomplete"); - } -}); - -$.Autocompleter = function(input, options) { - - var KEY = { - UP: 38, - DOWN: 40, - DEL: 46, - TAB: 9, - RETURN: 13, - ESC: 27, - COMMA: 188, - PAGEUP: 33, - PAGEDOWN: 34, - BACKSPACE: 8 - }; - - // Create $ object for input element - var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass); - - var timeout; - var previousValue = ""; - var cache = $.Autocompleter.Cache(options); - var hasFocus = 0; - var lastKeyPressCode; - var config = { - mouseDownOnSelect: false - }; - var select = $.Autocompleter.Select(options, input, selectCurrent, config); - - var blockSubmit; - - // prevent form submit in opera when selecting with return key - $.browser.opera && $(input.form).bind("submit.autocomplete", function() { - if (blockSubmit) { - blockSubmit = false; - return false; - } - }); - - // only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all - $input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) { - // track last key pressed - lastKeyPressCode = event.keyCode; - switch(event.keyCode) { - - case KEY.UP: - event.preventDefault(); - if ( select.visible() ) { - select.prev(); - } else { - onChange(0, true); - } - break; - - case KEY.DOWN: - event.preventDefault(); - if ( select.visible() ) { - select.next(); - } else { - onChange(0, true); - } - break; - - case KEY.PAGEUP: - event.preventDefault(); - if ( select.visible() ) { - select.pageUp(); - } else { - onChange(0, true); - } - break; - - case KEY.PAGEDOWN: - event.preventDefault(); - if ( select.visible() ) { - select.pageDown(); - } else { - onChange(0, true); - } - break; - - // matches also semicolon - case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA: - case KEY.TAB: - case KEY.RETURN: - if( selectCurrent() ) { - // stop default to prevent a form submit, Opera needs special handling - event.preventDefault(); - blockSubmit = true; - return false; - } - break; - - case KEY.ESC: - select.hide(); - break; - - default: - clearTimeout(timeout); - timeout = setTimeout(onChange, options.delay); - break; - } - }).focus(function(){ - // track whether the field has focus, we shouldn't process any - // results if the field no longer has focus - hasFocus++; - }).blur(function() { - hasFocus = 0; - if (!config.mouseDownOnSelect) { - hideResults(); - } - }).click(function() { - // show select when clicking in a focused field - if ( hasFocus++ > 1 && !select.visible() ) { - onChange(0, true); - } - }).bind("search", function() { - // TODO why not just specifying both arguments? - var fn = (arguments.length > 1) ? arguments[1] : null; - function findValueCallback(q, data) { - var result; - if( data && data.length ) { - for (var i=0; i < data.length; i++) { - if( data[i].result.toLowerCase() == q.toLowerCase() ) { - result = data[i]; - break; - } - } - } - if( typeof fn == "function" ) fn(result); - else $input.trigger("result", result && [result.data, result.value]); - } - $.each(trimWords($input.val()), function(i, value) { - request(value, findValueCallback, findValueCallback); - }); - }).bind("flushCache", function() { - cache.flush(); - }).bind("setOptions", function() { - $.extend(options, arguments[1]); - // if we've updated the data, repopulate - if ( "data" in arguments[1] ) - cache.populate(); - }).bind("unautocomplete", function() { - select.unbind(); - $input.unbind(); - $(input.form).unbind(".autocomplete"); - }); - - - function selectCurrent() { - var selected = select.selected(); - if( !selected ) - return false; - - var v = selected.result; - previousValue = v; - - if ( options.multiple ) { - var words = trimWords($input.val()); - if ( words.length > 1 ) { - v = words.slice(0, words.length - 1).join( options.multipleSeparator ) + options.multipleSeparator + v; - } - v += options.multipleSeparator; - } - - $input.val(v); - hideResultsNow(); - $input.trigger("result", [selected.data, selected.value]); - return true; - } - - function onChange(crap, skipPrevCheck) { - if( lastKeyPressCode == KEY.DEL ) { - select.hide(); - return; - } - - var currentValue = $input.val(); - - if ( !skipPrevCheck && currentValue == previousValue ) - return; - - previousValue = currentValue; - - currentValue = lastWord(currentValue); - if ( currentValue.length >= options.minChars) { - $input.addClass(options.loadingClass); - if (!options.matchCase) - currentValue = currentValue.toLowerCase(); - request(currentValue, receiveData, hideResultsNow); - } else { - stopLoading(); - select.hide(); - } - }; - - function trimWords(value) { - if ( !value ) { - return [""]; - } - var words = value.split( options.multipleSeparator ); - var result = []; - $.each(words, function(i, value) { - if ( $.trim(value) ) - result[i] = $.trim(value); - }); - return result; - } - - function lastWord(value) { - if ( !options.multiple ) - return value; - var words = trimWords(value); - return words[words.length - 1]; - } - - // fills in the input box w/the first match (assumed to be the best match) - // q: the term entered - // sValue: the first matching result - function autoFill(q, sValue){ - // autofill in the complete box w/the first match as long as the user hasn't entered in more data - // if the last user key pressed was backspace, don't autofill - if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) { - // fill in the value (keep the case the user has typed) - $input.val($input.val() + sValue.substring(lastWord(previousValue).length)); - // select the portion of the value not typed by the user (so the next character will erase) - $.Autocompleter.Selection(input, previousValue.length, previousValue.length + sValue.length); - } - }; - - function hideResults() { - clearTimeout(timeout); - timeout = setTimeout(hideResultsNow, 200); - }; - - function hideResultsNow() { - var wasVisible = select.visible(); - select.hide(); - clearTimeout(timeout); - stopLoading(); - if (options.mustMatch) { - // call search and run callback - $input.search( - function (result){ - // if no value found, clear the input box - if( !result ) { - if (options.multiple) { - var words = trimWords($input.val()).slice(0, -1); - $input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") ); - } - else - $input.val( "" ); - } - } - ); - } - if (wasVisible) - // position cursor at end of input field - $.Autocompleter.Selection(input, input.value.length, input.value.length); - }; - - function receiveData(q, data) { - if ( data && data.length && hasFocus ) { - stopLoading(); - select.display(data, q); - autoFill(q, data[0].value); - select.show(); - } else { - hideResultsNow(); - } - }; - - function request(term, success, failure) { - if (!options.matchCase) - term = term.toLowerCase(); - var data = cache.load(term); - // recieve the cached data - if (data && data.length) { - success(term, data); - // if an AJAX url has been supplied, try loading the data now - } else if( (typeof options.url == "string") && (options.url.length > 0) ){ - - var extraParams = { - timestamp: +new Date() - }; - $.each(options.extraParams, function(key, param) { - extraParams[key] = typeof param == "function" ? param() : param; - }); - - $.ajax({ - // try to leverage ajaxQueue plugin to abort previous requests - mode: "abort", - // limit abortion to this input - port: "autocomplete" + input.name, - dataType: options.dataType, - url: options.url, - data: $.extend({ - q: lastWord(term), - limit: options.max - }, extraParams), - success: function(data) { - var parsed = options.parse && options.parse(data) || parse(data); - cache.add(term, parsed); - success(term, parsed); - } - }); - } else { - // if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match - select.emptyList(); - failure(term); - } - }; - - function parse(data) { - var parsed = []; - var rows = data.split("\n"); - for (var i=0; i < rows.length; i++) { - var row = $.trim(rows[i]); - if (row) { - row = row.split("|"); - parsed[parsed.length] = { - data: row, - value: row[0], - result: options.formatResult && options.formatResult(row, row[0]) || row[0] - }; - } - } - return parsed; - }; - - function stopLoading() { - $input.removeClass(options.loadingClass); - }; - -}; - -$.Autocompleter.defaults = { - inputClass: "ac_input", - resultsClass: "ac_results", - loadingClass: "ac_loading", - minChars: 1, - delay: 400, - matchCase: false, - matchSubset: true, - matchContains: false, - cacheLength: 10, - max: 100, - mustMatch: false, - extraParams: {}, - selectFirst: true, - formatItem: function(row) { return row[0]; }, - formatMatch: null, - autoFill: false, - width: 0, - multiple: false, - multipleSeparator: ", ", - highlight: function(value, term) { - return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); - }, - scroll: true, - scrollHeight: 180 -}; - -$.Autocompleter.Cache = function(options) { - - var data = {}; - var length = 0; - - function matchSubset(s, sub) { - if (!options.matchCase) - s = s.toLowerCase(); - var i = s.indexOf(sub); - if (options.matchContains == "word"){ - i = s.toLowerCase().search("\\b" + sub.toLowerCase()); - } - if (i == -1) return false; - return i == 0 || options.matchContains; - }; - - function add(q, value) { - if (length > options.cacheLength){ - flush(); - } - if (!data[q]){ - length++; - } - data[q] = value; - } - - function populate(){ - if( !options.data ) return false; - // track the matches - var stMatchSets = {}, - nullData = 0; - - // no url was specified, we need to adjust the cache length to make sure it fits the local data store - if( !options.url ) options.cacheLength = 1; - - // track all options for minChars = 0 - stMatchSets[""] = []; - - // loop through the array and create a lookup structure - for ( var i = 0, ol = options.data.length; i < ol; i++ ) { - var rawValue = options.data[i]; - // if rawValue is a string, make an array otherwise just reference the array - rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue; - - var value = options.formatMatch(rawValue, i+1, options.data.length); - if ( value === false ) - continue; - - var firstChar = value.charAt(0).toLowerCase(); - // if no lookup array for this character exists, look it up now - if( !stMatchSets[firstChar] ) - stMatchSets[firstChar] = []; - - // if the match is a string - var row = { - value: value, - data: rawValue, - result: options.formatResult && options.formatResult(rawValue) || value - }; - - // push the current match into the set list - stMatchSets[firstChar].push(row); - - // keep track of minChars zero items - if ( nullData++ < options.max ) { - stMatchSets[""].push(row); - } - }; - - // add the data items to the cache - $.each(stMatchSets, function(i, value) { - // increase the cache size - options.cacheLength++; - // add to the cache - add(i, value); - }); - } - - // populate any existing data - setTimeout(populate, 25); - - function flush(){ - data = {}; - length = 0; - } - - return { - flush: flush, - add: add, - populate: populate, - load: function(q) { - if (!options.cacheLength || !length) - return null; - /* - * if dealing w/local data and matchContains than we must make sure - * to loop through all the data collections looking for matches - */ - if( !options.url && options.matchContains ){ - // track all matches - var csub = []; - // loop through all the data grids for matches - for( var k in data ){ - // don't search through the stMatchSets[""] (minChars: 0) cache - // this prevents duplicates - if( k.length > 0 ){ - var c = data[k]; - $.each(c, function(i, x) { - // if we've got a match, add it to the array - if (matchSubset(x.value, q)) { - csub.push(x); - } - }); - } - } - return csub; - } else - // if the exact item exists, use it - if (data[q]){ - return data[q]; - } else - if (options.matchSubset) { - for (var i = q.length - 1; i >= options.minChars; i--) { - var c = data[q.substr(0, i)]; - if (c) { - var csub = []; - $.each(c, function(i, x) { - if (matchSubset(x.value, q)) { - csub[csub.length] = x; - } - }); - return csub; - } - } - } - return null; - } - }; -}; - -$.Autocompleter.Select = function (options, input, select, config) { - var CLASSES = { - ACTIVE: "ac_over" - }; - - var listItems, - active = -1, - data, - term = "", - needsInit = true, - element, - list; - - // Create results - function init() { - if (!needsInit) - return; - element = $("
") - .hide() - .addClass(options.resultsClass) - .css("position", "absolute") - .appendTo(document.body); - - list = $("
    ").appendTo(element).mouseover( function(event) { - if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') { - active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event)); - $(target(event)).addClass(CLASSES.ACTIVE); - } - }).click(function(event) { - $(target(event)).addClass(CLASSES.ACTIVE); - select(); - // TODO provide option to avoid setting focus again after selection? useful for cleanup-on-focus - input.focus(); - return false; - }).mousedown(function() { - config.mouseDownOnSelect = true; - }).mouseup(function() { - config.mouseDownOnSelect = false; - }); - - if( options.width > 0 ) - element.css("width", options.width); - - needsInit = false; - } - - function target(event) { - var element = event.target; - while(element && element.tagName != "LI") - element = element.parentNode; - // more fun with IE, sometimes event.target is empty, just ignore it then - if(!element) - return []; - return element; - } - - function moveSelect(step) { - listItems.slice(active, active + 1).removeClass(CLASSES.ACTIVE); - movePosition(step); - var activeItem = listItems.slice(active, active + 1).addClass(CLASSES.ACTIVE); - if(options.scroll) { - var offset = 0; - listItems.slice(0, active).each(function() { - offset += this.offsetHeight; - }); - if((offset + activeItem[0].offsetHeight - list.scrollTop()) > list[0].clientHeight) { - list.scrollTop(offset + activeItem[0].offsetHeight - list.innerHeight()); - } else if(offset < list.scrollTop()) { - list.scrollTop(offset); - } - } - }; - - function movePosition(step) { - active += step; - if (active < 0) { - active = listItems.size() - 1; - } else if (active >= listItems.size()) { - active = 0; - } - } - - function limitNumberOfItems(available) { - return options.max && options.max < available - ? options.max - : available; - } - - function fillList() { - list.empty(); - var max = limitNumberOfItems(data.length); - for (var i=0; i < max; i++) { - if (!data[i]) - continue; - var formatted = options.formatItem(data[i].data, i+1, max, data[i].value, term); - if ( formatted === false ) - continue; - var li = $("
  • ").html( options.highlight(formatted, term) ).addClass(i%2 == 0 ? "ac_even" : "ac_odd").appendTo(list)[0]; - $.data(li, "ac_data", data[i]); - } - listItems = list.find("li"); - if ( options.selectFirst ) { - listItems.slice(0, 1).addClass(CLASSES.ACTIVE); - active = 0; - } - // apply bgiframe if available - if ( $.fn.bgiframe ) - list.bgiframe(); - } - - return { - display: function(d, q) { - init(); - data = d; - term = q; - fillList(); - }, - next: function() { - moveSelect(1); - }, - prev: function() { - moveSelect(-1); - }, - pageUp: function() { - if (active != 0 && active - 8 < 0) { - moveSelect( -active ); - } else { - moveSelect(-8); - } - }, - pageDown: function() { - if (active != listItems.size() - 1 && active + 8 > listItems.size()) { - moveSelect( listItems.size() - 1 - active ); - } else { - moveSelect(8); - } - }, - hide: function() { - element && element.hide(); - listItems && listItems.removeClass(CLASSES.ACTIVE); - active = -1; - }, - visible : function() { - return element && element.is(":visible"); - }, - current: function() { - return this.visible() && (listItems.filter("." + CLASSES.ACTIVE)[0] || options.selectFirst && listItems[0]); - }, - show: function() { - var offset = $(input).offset(); - element.css({ - width: typeof options.width == "string" || options.width > 0 ? options.width : $(input).width(), - top: offset.top + input.offsetHeight, - left: offset.left - }).show(); - if(options.scroll) { - list.scrollTop(0); - list.css({ - maxHeight: options.scrollHeight, - overflow: 'auto' - }); - - if($.browser.msie && typeof document.body.style.maxHeight === "undefined") { - var listHeight = 0; - listItems.each(function() { - listHeight += this.offsetHeight; - }); - var scrollbarsVisible = listHeight > options.scrollHeight; - list.css('height', scrollbarsVisible ? options.scrollHeight : listHeight ); - if (!scrollbarsVisible) { - // IE doesn't recalculate width when scrollbar disappears - listItems.width( list.width() - parseInt(listItems.css("padding-left")) - parseInt(listItems.css("padding-right")) ); - } - } - - } - }, - selected: function() { - var selected = listItems && listItems.filter("." + CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE); - return selected && selected.length && $.data(selected[0], "ac_data"); - }, - emptyList: function (){ - list && list.empty(); - }, - unbind: function() { - element && element.remove(); - } - }; -}; - -$.Autocompleter.Selection = function(field, start, end) { - if( field.createTextRange ){ - var selRange = field.createTextRange(); - selRange.collapse(true); - selRange.moveStart("character", start); - selRange.moveEnd("character", end); - selRange.select(); - } else if( field.setSelectionRange ){ - field.setSelectionRange(start, end); - } else { - if( field.selectionStart ){ - field.selectionStart = start; - field.selectionEnd = end; - } - } - field.focus(); -}; - -})(jQuery); \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/layout.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/layout.vm deleted file mode 100644 index 6ba856fb6..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/layout.vm +++ /dev/null @@ -1,17 +0,0 @@ - - - #parse("head.vm") - - - - -
    - $content -
    - - - \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/main.css b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/main.css deleted file mode 100644 index fa221c535..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/main.css +++ /dev/null @@ -1,182 +0,0 @@ -#admin{ - text-align: right; - vertical-align: top; -} - -#head{ - width: 100%; -} -.array-field { - border: 2px solid #474747; - background: #FFE9D8; - padding: 5px; - margin: 5px; -} - -.array-field-list li { - list-style: circle; - margin-left: 20px; -} - -body { - font-family: Helvetica, Arial, sans-serif; - font-size: 10pt; -} - -a { - color: #43a4b1; -} - -.navigators { - float: left; - margin: 5px; - margin-top: 0px; - width: 185px; - padding: 5px; - position: relative; -} - -.navigators h2 { - background: #FEC293; - border: 1px solid #ce9d77; - padding: 5px; -} - -.navigators ul { - list-style: none; - margin: 0; - margin-bottom: 5px; - margin-top: 5px; - padding-left: 10px; -} - -.navigators ul li { - color: #999; - padding: 2px; -} - - - -.facet-field { - font-weight: bold; -} - -.highlight { - color: white; - background-color: gray; - border: 1px black solid; -} - -.highlight-box { - margin-left: 15px; -} - -.field-name { - font-weight: bold; -} - -.highlighted-facet-field { - background: white; -} - -.constraints { - margin-top: 10px; -} - -#query-form{ - width: 80%; -} - - - -.query-box, .constraints { - padding: 5px; - margin: 5px; - font-weight: normal; - font-size: 24px; - letter-spacing: 0.08em; -} - -.query-box #q { - margin-left: 8px; - width: 60%; - height: 50px; - border: 1px solid #999; - font-size: 1em; - padding: 0.4em; -} - -.query-box { - -} - -.query-boost { - - top: 10px; - left: 50px; - position: relative; - font-size: 0.8em; -} - -.query-box .inputs{ - left: 180px; - position: relative; - -} - -#logo { - margin: 10px; - border-style: none; -} - -.pagination { - padding-left: 33%; - background: #eee; - margin: 5px; - margin-left: 210px; - padding-top: 5px; - padding-bottom: 5px; -} - -.result-document { - border: 1px solid #999; - padding: 5px; - margin: 5px; - margin-left: 210px; - margin-bottom: 15px; -} - -.result-document div{ - padding: 5px; -} - -.result-title{ - width:60%; -} - -.mlt{ - -} - -.map{ - float: right; - position: relative; - top: -25px; -} - -.result-document:nth-child(2n+1) { - background-color: #eee; -} - - -.selected-facet-field { - font-weight: bold; -} - -li.show { - list-style: disc; -} - -.group-value{ - font-weight: bold; -} \ No newline at end of file diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/query.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/query.vm deleted file mode 100644 index 1948d28ff..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/query.vm +++ /dev/null @@ -1,54 +0,0 @@ - - -
    -
    -
    - Find: -
    -
    - - #if($request.params.get('debugQuery')) - - #end - #if($annotate == true) - - #end - #foreach($fq in $request.params.getParams('fq')) - #if ($fq != "{!bbox}") - - #end - #end -
    - #foreach($fq in $params.getParams('fq')) - #set($previous_fq_count=$velocityCount - 1) - #if($fq != '') - > $fq - #end - #end -
    - #if($request.params.get('debugQuery')) - toggle parsed query - 
    $response.response.debug.parsedquery
    - #end - #set($queryOpts = $request.params.get("queryOpts")) - #if($queryOpts && $queryOpts != "") - - #end - - -
diff --git a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/suggest.vm b/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/suggest.vm deleted file mode 100644 index 0f554ce04..000000000 --- a/docker/typo3-solr/5.0/solr/typo3cores/conf/velocity/suggest.vm +++ /dev/null @@ -1,3 +0,0 @@ -#foreach($t in $response.response.terms.title) -$t.key -#end \ No newline at end of file diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile deleted file mode 100644 index 99fe9d15e..000000000 --- a/docker/typo3-solr/6.0/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:6.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.3.0 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/6.0.1.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 deleted file mode 100644 index c5a985735..000000000 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.3.0") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('6.0.1') }} diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile deleted file mode 100644 index 81f6f617f..000000000 --- a/docker/typo3-solr/6.1/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:6.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.3.0 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/6.1.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/6.1/Dockerfile.jinja2 b/docker/typo3-solr/6.1/Dockerfile.jinja2 deleted file mode 100644 index da2580340..000000000 --- a/docker/typo3-solr/6.1/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.3.0") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('6.1.0') }} diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile deleted file mode 100644 index 42bfb5c80..000000000 --- a/docker/typo3-solr/6.5/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:6.5 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.6.2 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/6.5.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/6.5/Dockerfile.jinja2 b/docker/typo3-solr/6.5/Dockerfile.jinja2 deleted file mode 100644 index ac1f70ea9..000000000 --- a/docker/typo3-solr/6.5/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.6.2") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('6.5.0') }} diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile deleted file mode 100644 index 7ce835b86..000000000 --- a/docker/typo3-solr/7.0/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.3.0 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/7.0.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/7.0/Dockerfile.jinja2 b/docker/typo3-solr/7.0/Dockerfile.jinja2 deleted file mode 100644 index bc7e00d83..000000000 --- a/docker/typo3-solr/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.3.0") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('7.0.0') }} diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile deleted file mode 100644 index b4d4c46b2..000000000 --- a/docker/typo3-solr/7.5/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:7.5 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.6.2 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/7.5.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/7.5/Dockerfile.jinja2 b/docker/typo3-solr/7.5/Dockerfile.jinja2 deleted file mode 100644 index b8e31fe09..000000000 --- a/docker/typo3-solr/7.5/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.6.2") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('7.5.0') }} diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile deleted file mode 100644 index dceaf0569..000000000 --- a/docker/typo3-solr/8.0/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.6.2 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/8.0.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/8.0/Dockerfile.jinja2 b/docker/typo3-solr/8.0/Dockerfile.jinja2 deleted file mode 100644 index 613d56aed..000000000 --- a/docker/typo3-solr/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.6.2") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('8.0.0') }} diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile deleted file mode 100644 index 9353baefc..000000000 --- a/docker/typo3-solr/8.1/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/typo3-solr:8.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM solr:6.6.3 - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" - -USER root - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/8.1.0.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - && docker-image-cleanup - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/8.1/Dockerfile.jinja2 b/docker/typo3-solr/8.1/Dockerfile.jinja2 deleted file mode 100644 index 31e80940c..000000000 --- a/docker/typo3-solr/8.1/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ - -{{ docker.fromOfficial("solr", "6.6.3") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ typo3Solr.official('8.1.0') }} diff --git a/docker/typo3-solr/latest b/docker/typo3-solr/latest deleted file mode 120000 index b293f64d6..000000000 --- a/docker/typo3-solr/latest +++ /dev/null @@ -1 +0,0 @@ -8.0 \ No newline at end of file diff --git a/docker/varnish/README.md b/docker/varnish/README.md deleted file mode 100644 index 85008be77..000000000 --- a/docker/varnish/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# varnish container layout - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -## Filesystem layout - -The whole docker directroy is deployed into `/opt/docker/`. - -File | Description ------------------------------------------- | ------------------------------------------------------------------------------ -`/opt/docker/bin/entrypoint.d/varnishd.sh` | Entrypoint cmd file for starting varnishd -`/opt/docker/etc/varnish/varnish.vcl` | Default varnish configuration file (with `VARNISH_BACKEND_HOST` and `VARNISH_BACKEND_PORT` markers) - - -## Environment variables - -Variable | Description ----------------------- | ------------------------------------------------------------------------------ -`VARNISH_PORT` | Listening port of varnish -`VARNISH_CONFIG` | Path to custom varnish configuration file (must be uploaded to image) -`VARNISH_STORAGE` | Storage setting (default: `malloc,128m`) -`VARNISH_OPTS` | Extra varnishd options -`VARNISH_BACKEND_HOST` | Host of backend server -`VARNISH_BACKEND_PORT` | Port of backend server (default: `80`) - diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile deleted file mode 100644 index fb1d975b4..000000000 --- a/docker/varnish/latest/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/varnish:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:alpine - -ENV VARNISH_PORT 80 - -ENV VARNISH_CONFIG "" -ENV VARNISH_STORAGE "malloc,128m" -ENV VARNISH_OPTS "" - -ENV VARNISH_BACKEND_HOST "" -ENV VARNISH_BACKEND_PORT "80" - -COPY conf/ /opt/docker/ - -RUN set -x \ - && apk-install \ - varnish \ - && docker-run-bootstrap \ - && docker-image-cleanup - -CMD ["varnishd"] - -EXPOSE 80 diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 deleted file mode 100644 index 23dd98c0f..000000000 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("base","alpine") }} - -{{ varnish.env() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ varnish.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.cmd("varnishd") }} - -{{ docker.expose('80') }} diff --git a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh b/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh deleted file mode 100644 index 8879926cd..000000000 --- a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -if [[ -n "$VARNISH_CONFIG" ]]; then - echo " Using CUSTOM varnish configuration file" - - if [[ ! -f "$VARNISH_CONFIG" ]]; then - echo "[ERROR] Varnish configuration file '${VARNISH_CONFIG}' not found" - exit 1 - fi -else - echo "Using DEFAULT varnish configuration" - - VARNISH_CONFIG="/opt/docker/etc/varnish/varnish.vcl" - - if [[ -z "$VARNISH_BACKEND_HOST" ]]; then - echo "[ERROR] No varnish backend host set (VARNISH_BACKEND_HOST)" - exit 1 - fi - - if [[ -z "$VARNISH_BACKEND_PORT" ]]; then - echo "[ERROR] No varnish backend port set (VARNISH_BACKEND_PORT)" - exit 1 - fi -fi - -if [[ -z "$VARNISH_STORAGE" ]]; then - "[ERROR] No varnish storage definition set (VARNISH_STORAGE)" - exit 1 -fi - -if [[ -z "$VARNISH_PORT" ]]; then - "[ERROR] No varnish listen port set (VARNISH_PORT)" - exit 1 -fi - -go-replace \ - -s "" -r "$VARNISH_BACKEND_HOST" \ - -s "" -r "$VARNISH_BACKEND_PORT" \ - -- "$VARNISH_CONFIG" - -echo " Starting varnishd..." -echo " listening on: 0.0.0.0:${VARNISH_PORT}" -echo " config file: ${VARNISH_CONFIG}" -echo " backend: ${VARNISH_BACKEND_HOST}:${VARNISH_BACKEND_PORT}" -echo " storage: ${VARNISH_STORAGE}" -echo " varnishd opts: ${VARNISH_OPTS}" -echo "" - -exec varnishd -j unix,user=varnish -F \ - -a "0.0.0.0:${VARNISH_PORT}" \ - -f "$VARNISH_CONFIG" \ - -s "$VARNISH_STORAGE" \ - $VARNISH_OPTS diff --git a/docker/varnish/latest/conf/etc/varnish/varnish.vcl b/docker/varnish/latest/conf/etc/varnish/varnish.vcl deleted file mode 100644 index 0f0932b8f..000000000 --- a/docker/varnish/latest/conf/etc/varnish/varnish.vcl +++ /dev/null @@ -1,9 +0,0 @@ -vcl 4.0; - -import std; -import directors; - -backend default { - .host = ""; - .port = ""; -} diff --git a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst deleted file mode 100644 index bf1e1d5b2..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst +++ /dev/null @@ -1,12 +0,0 @@ -================= -webdevops/ansible -================= - -*deprecated* - -All ``webdevops/ansible`` images are based on ``webvdevops/bootstrap`` without any changes. - -Docker image tags ------------------ - -.. include:: include/image-tag-base.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst deleted file mode 100644 index 2a215ed93..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst +++ /dev/null @@ -1,32 +0,0 @@ -==================== -webdevops/apache-dev -==================== - -These image extends ``webdevops/base`` with a apache daemon which is running on port 80 and 443 - -.. include:: include/general-supervisor.rst -.. include:: include/info-web-development.rst - -Docker image tags ------------------ - -.. include:: include/image-tag-base.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base-app.rst -.. include:: include/environment-web-dev.rst - - -Customization -------------- - -.. include:: include/customization-apache.rst - - -Docker image layout -------------------- - -.. include:: include/layout-apache.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/certbot.rst b/documentation/docs/content/DockerImages/dockerfiles/certbot.rst deleted file mode 100644 index 1021dc5b7..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/certbot.rst +++ /dev/null @@ -1,15 +0,0 @@ -================= -webdevops/certbot -================= - -The certbot images are based on ``webdevops/bootstrap`` with let's encrypt certbot toolbox. - -Docker image tags ------------------ - -====================== ========================== -Tag Distribution name -====================== ========================== -``latest`` Alpine 3 -====================== ========================== - diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst deleted file mode 100644 index decc2bbfe..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst +++ /dev/null @@ -1,36 +0,0 @@ -===================== -webdevops/hhvm-apache -===================== - -*deprecated* - -These image extends ``webdevops/hhvm`` with a apache daemon which is running on port 80 and 443 - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - - -.. include:: include/image-tag-hhvm.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst -.. include:: include/environment-web.rst - - -Customization -------------- - -.. include:: include/customization-apache.rst - - -Docker image layout -------------------- - -.. include:: include/layout-apache.rst -.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst deleted file mode 100644 index 35c6b913f..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm-nginx.rst +++ /dev/null @@ -1,36 +0,0 @@ -==================== -webdevops/hhvm-nginx -==================== - -*deprecated* - -These image extends ``webdevops/hhvm`` with a nginx daemon which is running on port 80 and 443 - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - - -.. include:: include/image-tag-hhvm.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst -.. include:: include/environment-web.rst - - -Customization -------------- - -.. include:: include/customization-nginx.rst - - -Docker image layout -------------------- - -.. include:: include/layout-nginx.rst -.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst deleted file mode 100644 index d4f964d5e..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst +++ /dev/null @@ -1,27 +0,0 @@ -============== -webdevops/hhvm -============== - -*deprecated* - -The hhvm images are based on ``webdevops/base-app`` with HHVM cli and HHVM daemon. HHVM daemon is running on port 9000. - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - - -.. include:: include/image-tag-hhvm.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst - -Docker image layout -------------------- - -.. include:: include/layout-hhvm.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/liquibase.rst b/documentation/docs/content/DockerImages/dockerfiles/liquibase.rst deleted file mode 100644 index c0b57aab8..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/liquibase.rst +++ /dev/null @@ -1,43 +0,0 @@ -=================== -webdevops/liquibase -=================== - -The liquibase images are based on ``java`` with liquibase and mysql driver - -Docker image tags ------------------ - -====================== ============================================= -Tag Distribution name -====================== ============================================= -``latest`` Based on official java with mysql support -``mysql`` Based on official java with mysql support -``postgres`` Based on official java with postgres support -====================== ============================================= - -Environment variables ---------------------- - -========================== ============================ ============================================== -Environment variable Description Default -========================== ============================ ============================================== -``LIQUIBASE_VERSION`` Installed Liquibase version *not changeable* -``LIQUIBASE_DRIVER`` Database driver *based on docker tag* -``LIQUIBASE_CLASSPATH`` Java class path *based on docker tag* -``LIQUIBASE_URL`` DB url *empty* (eg. ``jdbc:mysql://host/app``) -``LIQUIBASE_USERNAME`` DB username *empty* -``LIQUIBASE_PASSWORD`` DB password *empty* -``LIQUIBASE_CHANGELOG`` Changelog file ``/liquibase/changelog.xml`` -``LIQUIBASE_CONTEXTS`` Server contexts *empty* -``LIQUIBASE_OPTS`` Additional options *empty* -========================== ============================ ============================================== - -Usage ------ - - -MYSQL: Expecting the ``changelog.xml`` is inside the current directory the update process can be started with: -``docker run --rm -v $(pwd):/liquibase/ -e "LIQUIBASE_URL=jdbc:mysql://host/app" -e "LIQUIBASE_USERNAME=root" -e "LIQUIBASE_PASSWORD=root" webdevops/liquibase:mysql update`` - -POSTGRESL: Expecting the ``changelog.xml`` is inside the current directory the update process can be started with: -``docker run --rm -v $(pwd):/liquibase/ -e "LIQUIBASE_URL=jdbc:postgresql://host:5432/sampledb" -e "LIQUIBASE_USERNAME=root" -e "LIQUIBASE_PASSWORD=root" webdevops/liquibase:postgres update`` diff --git a/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst b/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst deleted file mode 100644 index a8b606c17..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst +++ /dev/null @@ -1,55 +0,0 @@ -==================== -webdevops/liquidsoap -==================== - -The liquidsoap images are based on ``webdevops/base`` with liquidsoap multimedia streaming server with most plugins. - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - -====================== ============================================= -Tag Distribution name -====================== ============================================= -``latest`` Based on `webdevops/base:latest` (Ubuntu) -====================== ============================================= - -Environment variables ---------------------- - -.. include:: include/environment-base.rst - - -Liquisoap environment variables -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -====================================================== ===================================== ============================================== -Environment variable Description Default -====================================================== ===================================== ============================================== -``LIQUIDSOAP_USER`` Daemon user ID ``liquidsoap`` -``LIQUIDSOAP_TELNET`` Open telnet (port 1234) ``1`` (enabled) -``LIQUIDSOAP_SCRIPT`` Configuration script for liquidsoap ``/opt/docker/etc/liquidsoap/default.liq`` -``LIQUIDSOAP_TEMPLATE`` Apply template to config script ``1/opt/docker/etc/liquidsoap/default.liq`` - -``LIQUIDSOAP_STREAM_INPUT`` Input stream (eg. icecast) ``http://icecast:8000/live`` - -``LIQUIDSOAP_PLAYLIST_DEFAULT`` Default stream when no other stream ``audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))`` - is active - -``LIQUIDSOAP_PLAYLIST_DAY`` Day input stream/playlist ``playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')`` -``LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE`` Timerange for day playlist ``4h-2h`` - -``LIQUIDSOAP_PLAYLIST_NIGHT`` Night input stream/playlist ``playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')`` -``LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE`` Timerange for night playlist ``2h-14h`` - -``LIQUIDSOAP_OUTPUT`` Output stream (eg. icecast) ``output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)`` - -``LIQUIDSOAP_OUTPUT_1`` ... ``LIQUIDSOAP_OUTPUT_20`` More output stream lines *empty* - - -``LIQUIDSOAP_META_NAME`` Station name ``Liquidsoap Docker`` -``LIQUIDSOAP_META_GENRE`` Station genre *empty* -``LIQUIDSOAP_META_URL`` Station url *empty* -``LIQUIDSOAP_META_DESCRIPTION`` Station description *empty* -====================================================== ===================================== ============================================== - diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst deleted file mode 100644 index 0270e82a0..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst +++ /dev/null @@ -1,39 +0,0 @@ -====================== -webdevops/mail-sandbox -====================== - -These image extends ``webdevops/base`` with a postfix daemon which is running on port 25 and dovecot on IMAP. - -This images catches all emails sent to it and stores them locally. These mails are available via IMAP and web (roundcube) - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - -====================== ========================== -Tag Distribution name -====================== ========================== -``latest`` Ubuntu 18.04 xenial (LTS) -====================== ========================== - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst - - -Mail sandbox environment variables -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -====================== ============================= ============= -Environment variable Description Default -====================== ============================= ============= -``MAILBOX_USERNAME`` IMAP user dev -``MAILBOX_PASSWORD`` IMAP user password dev -====================== ============================= ============= - -Docker image layout -------------------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst deleted file mode 100644 index 950943e90..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst +++ /dev/null @@ -1,33 +0,0 @@ -=================== -webdevops/nginx-dev -=================== - -These image extends ``webdevops/base`` with a nginx daemon which is running on port 80 and 443 - -.. include:: include/general-supervisor.rst -.. include:: include/info-web-development.rst - -Docker image tags ------------------ - -.. include:: include/image-tag-base.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-web-dev.rst - - -Customization -------------- - -.. include:: include/customization-nginx.rst - - -Docker image layout -------------------- - -.. include:: include/layout-nginx.rst -.. include:: include/layout-php.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst deleted file mode 100644 index d8dbe2b9e..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst +++ /dev/null @@ -1,20 +0,0 @@ -================= -webdevops/postfix -================= - -These image extends ``webdevops/base`` with a postfix daemon which is running on port 25 - -.. include:: include/general-supervisor.rst - -Docker image tags ------------------ - -.. include:: include/image-tag-base.rst - - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst - diff --git a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst deleted file mode 100644 index 6e19536b4..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst +++ /dev/null @@ -1,41 +0,0 @@ -=========================== -webdevops/samson-deployment -=========================== - -*deprecated* - -These image extends ``zendesk/samson`` and is a webbased deployment service with Ansistrano_, Capistrano_ and -PHP Deployer_. - -The original image is only the webbased deployment system and is extended by: - -* Ansible_ with Ansistrano_ -* Capistrano_ -* PHP Deployer_ -* Magallanes_ -* git -* rsync -* docker & docker-compose (as client) -* gulp, grunt, bower -* PHP cli & composer_ - -.. include:: include/general-supervisor.rst - -Environment variables ---------------------- - -.. include:: include/environment-base.rst -.. include:: include/environment-base-app.rst - - -Docker image layout -------------------- - - - -.. _Ansible: https://www.ansible.com/ -.. _Ansistrano: http://capistranorb.com -.. _Capistrano: https://github.com/ansistrano/deploy -.. _Deployer: http://deployer.org/ -.. _Magallanes: http://magephp.com/ -.. _composer: https://getcomposer.org/ diff --git a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst deleted file mode 100644 index 7d0f15423..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst +++ /dev/null @@ -1,25 +0,0 @@ -================ -webdevops/sphinx -================ - -*deprecated* - -These image extends ``webdevops/bootstrap`` and provides a sphinx build system. - -Docker image tags ------------------ - -====================== ========================== -Tag Distribution name -====================== ========================== -``latest`` Alpine 3 -====================== ========================== - - -Usage ------ - -.. code-block:: bash - - # Build and watches documentation in ./documentation/docs/ - docker run -t -i --rm -p 8080:8000 -v "$(pwd)/documentation/docs/:/opt/docs" webdevops/sphinx sphinx-autobuild --poll -H 0.0.0.0 /opt/docs html diff --git a/documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst b/documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst deleted file mode 100644 index 030b45b1e..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/typo3-solr.rst +++ /dev/null @@ -1,16 +0,0 @@ -==================== -webdevops/typo3-solr -==================== - -*deprecated* - -These image extends ``solr`` and provides a prebuild image for TYPO3 solr service. - -Docker image tags ------------------ - -====================== ===================================== -Tag Distribution name -====================== ===================================== -``6.3.0`` TYPO3 Solr service for EXT:solr 6.3.0 -====================== ===================================== diff --git a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst deleted file mode 100644 index d21e3dbe8..000000000 --- a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst +++ /dev/null @@ -1,29 +0,0 @@ -================= -webdevops/varnish -================= - -These image extends ``webdevops/base`` and provides a standalone varnish server running on port 80. - -Docker image tags ------------------ - -====================== ========================== -Tag Distribution name -====================== ========================== -``latest`` Alpine 3 -====================== ========================== - - -Environment variables ---------------------- - -========================= ==================================== ============= -Environment variable Description Default -========================= ==================================== ============= -``VARNISH_PORT`` Listening port ``80`` -``VARNISH_CONFIG`` Custom configuration file `empty` -``VARNISH_STORAGE`` Storage cache setting ``malloc,128m`` -``VARNISH_OPTS`` Additional varnish command options `empty` -``VARNISH_BACKEND_HOST`` Backend server hostname `empty` -``VARNISH_BACKEND_PORT`` Backend server port ``80`` -========================= ==================================== ============= diff --git a/provisioning/hhvm-apache/general/etc/httpd/conf.d/.gitkeep b/provisioning/hhvm-apache/general/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/provisioning/hhvm-apache/general/etc/httpd/conf.d/10-php.conf b/provisioning/hhvm-apache/general/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index 4368d12ef..000000000 --- a/provisioning/hhvm-apache/general/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout=600 - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/provisioning/hhvm-apache/general/provision/bootstrap.d/10-hhvm.sh b/provisioning/hhvm-apache/general/provision/bootstrap.d/10-hhvm.sh deleted file mode 100644 index b53541298..000000000 --- a/provisioning/hhvm-apache/general/provision/bootstrap.d/10-hhvm.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Setup listeing only to localhost -go-replace --mode=lineinfile \ - -s 'hhvm.server.ipl' -r 'hhvm.server.ip = 127.0.0.1' \ - -- /etc/hhvm/server.ini diff --git a/provisioning/hhvm-nginx/general/etc/nginx/conf.d/.gitkeep b/provisioning/hhvm-nginx/general/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/provisioning/hhvm-nginx/general/etc/nginx/conf.d/10-php.conf b/provisioning/hhvm-nginx/general/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 4cdbc305f..000000000 --- a/provisioning/hhvm-nginx/general/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server 127.0.0.1:9000; -} diff --git a/provisioning/hhvm-nginx/general/provision/bootstrap.d/10-hhvm.sh b/provisioning/hhvm-nginx/general/provision/bootstrap.d/10-hhvm.sh deleted file mode 100644 index b53541298..000000000 --- a/provisioning/hhvm-nginx/general/provision/bootstrap.d/10-hhvm.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Setup listeing only to localhost -go-replace --mode=lineinfile \ - -s 'hhvm.server.ipl' -r 'hhvm.server.ip = 127.0.0.1' \ - -- /etc/hhvm/server.ini diff --git a/provisioning/hhvm/general/bin/service.d/hhvm.d/10-init.sh b/provisioning/hhvm/general/bin/service.d/hhvm.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/provisioning/hhvm/general/bin/service.d/hhvm.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/provisioning/hhvm/general/bin/service.d/hhvm.sh b/provisioning/hhvm/general/bin/service.d/hhvm.sh deleted file mode 100644 index 12fc747de..000000000 --- a/provisioning/hhvm/general/bin/service.d/hhvm.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_HHVM_OPTS" ]]; then SERVICE_HHVM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/hhvm.d/" - -if [[ -z "$CONTAINER_UID" ]]; then - CONTAINER_UID="application" -fi - -exec gosu "${CONTAINER_UID}":"${CONTAINER_UID}" /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000 -vServer.AllowRunAsRoot=1 $SERVICE_HHVM_OPTS diff --git a/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf b/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf deleted file mode 100644 index 44ddf7d35..000000000 --- a/provisioning/hhvm/general/etc/supervisor.d/hhvm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:hhvm] -programs=hhvmd -priority=20 - -[program:hhvmd] -command = /opt/docker/bin/service.d/hhvm.sh -process_name=%(program_name)s -directory = /var/run/hhvm/ -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/provisioning/hhvm/general/provision/bootstrap.d/10-hhvm.sh b/provisioning/hhvm/general/provision/bootstrap.d/10-hhvm.sh deleted file mode 100644 index 02cd4a181..000000000 --- a/provisioning/hhvm/general/provision/bootstrap.d/10-hhvm.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -mkdir -p /var/run/hhvm/ -chown -R "${APPLICATION_USER}:${APPLICATION_GROUP}" /var/run/hhvm/ -chmod 0700 /var/run/hhvm/ - -# Setup hhvm configuration -go-replace --mode=lineinfile \ - -s 'hhvm.server.fix_path_info' -r 'hhvm.server.fix_path_info = true' \ - -s 'hhvm.log.file' -r 'hhvm.log.file = /docker.stdout' \ - -- /etc/hhvm/php.ini diff --git a/provisioning/liquibase/general/bin/entrypoint.sh b/provisioning/liquibase/general/bin/entrypoint.sh deleted file mode 100644 index 3e4fc1a1a..000000000 --- a/provisioning/liquibase/general/bin/entrypoint.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -set -o pipefail -set -o errtrace -set -o nounset -set -o errexit - -LIQUIBASE_OPTS="$LIQUIBASE_OPTS --defaultsFile=/liquibase.properties" - -echo -n > /liquibase.properties - -## Properties file -if [[ -f liquibase.properties ]]; then - cat liquibase.properties >> /liquibase.properties -fi - -## Database driver -if [[ -n "$LIQUIBASE_DRIVER" ]]; then - sed -i '/^driver:/d' /liquibase.properties - echo "driver: ${LIQUIBASE_DRIVER}" >> /liquibase.properties -fi - -## Classpath -if [[ -n "$LIQUIBASE_CLASSPATH" ]]; then - echo "classpath: ${LIQUIBASE_CLASSPATH}" >> /liquibase.properties -fi - -## Database url -if [[ -n "$LIQUIBASE_URL" ]]; then - echo "url: ${LIQUIBASE_URL}" >> /liquibase.properties -fi - -## Database username -if [[ -n "$LIQUIBASE_USERNAME" ]]; then - echo "username: ${LIQUIBASE_USERNAME}" >> /liquibase.properties -fi - -## Database password -if [[ -n "$LIQUIBASE_PASSWORD" ]]; then - echo "password: ${LIQUIBASE_PASSWORD}" >> /liquibase.properties -fi - -## Database contexts -if [[ -n "$LIQUIBASE_CONTEXTS" ]]; then - echo "contexts: ${LIQUIBASE_CONTEXTS}" >> /liquibase.properties -fi - -## Database changelog file -if [[ -n "$LIQUIBASE_CHANGELOG" ]]; then - if ! grep -q '^changeLogFile' /liquibase.properties; then - echo "changeLogFile: ${LIQUIBASE_CHANGELOG}" >> /liquibase.properties - fi -fi - -function executeLiquibase() { - exec /opt/liquibase/liquibase $LIQUIBASE_OPTS "$@" -} - - -if [[ "$#" -ge 1 ]]; then - TASK="$1" - shift - - case "$TASK" in - ## Custom liquibase command - liquibase) - executeLiquibase "$@" - ;; - - ## Database Update Commands - update|updateCount|updateSQL|updateCountSQL) ;& - ## Database Rollback Commands - rollback|rollbackToDate|rollbackCount|rollbackSQL|rollbackToDateSQL|rollbackCountSQL|updateTestingRollback|generateChangeLog) ;& - ## Diff Commands - diff|diffChangeLog) ;& - ## Documentation Commands - dbDoc) ;& - ## Maintenance Commands - status|validate|changelogSync|changelogSyncSQL|markNextChangeSetRan|listLocks|releaseLocks|dropAll|clearCheckSums) - if [[ "$#" -eq 0 ]]; then - executeLiquibase "$TASK" - else - executeLiquibase "$TASK" "$@" - fi - ;; - - ## show configuration - showConf) - cat /liquibase.properties - ;; - - ## Help - help) - cat < Applies the next change sets. - updateSQL Writes SQL to update database to current - version to STDOUT. - updateCountSQL Writes SQL to apply the next - change sets to STDOUT. - -Database Rollback Commands -------------------------------------------------------------------------------- - rollback Rolls back the database to the state it - was in when the tag was applied. - rollbackToDate Rolls back the database to the state it - was in at the given date/time. - rollbackCount Rolls back the last change sets. - rollbackSQL Writes SQL to roll back the database to - the state it was in when the tag was - applied to STDOUT. - rollbackToDateSQL Writes SQL to roll back the database to - the state it was in at the given date/time - version to STDOUT. - rollbackCountSQL Writes SQL to roll back the last - change sets to STDOUT. - futureRollbackSQL Writes SQL to roll back the database to - the current state after the changes in - the changeslog have been applied. - updateTestingRollback Updates the database, then rolls back - changes before updating again. - generateChangeLog generateChangeLog of the database to - standard out. v1.8 requires the dataDir - parameter currently. - -Diff Commands -------------------------------------------------------------------------------- - diff [diff parameters] Writes description of differences to - standard out. - diffChangeLog [diff parameters] Writes Change Log XML to update the base - database to the target database to - standard out. - -Documentation Commands -------------------------------------------------------------------------------- - dbDoc Generates Javadoc-like documentation based - on current database and change log. - -Maintenance Commands -------------------------------------------------------------------------------- - tag "Tags" the current database state for - future rollback. - tagExists Checks whether the given tag is already - existing. - status Outputs count (list if --verbose) of unrun - change sets. - validate Checks the changelog for errors. - changelogSync Mark all changes as executed in the - database. - changelogSyncSQL Writes SQL to mark all changes as executed - in the database to STDOUT. - markNextChangeSetRan Mark the next change set as executed in - the database. - listLocks Lists who currently has locks on the - database changelog. - releaseLocks Releases all locks on the database - changelog. - dropAll Drops all database objects owned by the - user. Note that functions, procedures - and packages are not dropped - (limitation in 1.8.1). - clearCheckSums Removes current checksums from database. - On next run checksums will be recomputed. -EOF - exit 1 - ;; - - ## Default task (eg. sh, bash) - *) - exec "$TASK" "$@" - ;; - esac -fi diff --git a/provisioning/mail-sandbox/general/bin/service.d/dovecot.d/10-init.sh b/provisioning/mail-sandbox/general/bin/service.d/dovecot.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/provisioning/mail-sandbox/general/bin/service.d/dovecot.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/provisioning/mail-sandbox/general/bin/service.d/dovecot.sh b/provisioning/mail-sandbox/general/bin/service.d/dovecot.sh deleted file mode 100644 index c1ca9422c..000000000 --- a/provisioning/mail-sandbox/general/bin/service.d/dovecot.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DOVECOT_OPTS" ]]; then SERVICE_DOVECOT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dovecot.d/" - -exec /usr/sbin/dovecot -F $SERVICE_DOVECOT_OPTS diff --git a/provisioning/mail-sandbox/general/etc/dovecot/local.conf b/provisioning/mail-sandbox/general/etc/dovecot/local.conf deleted file mode 100644 index 033012eac..000000000 --- a/provisioning/mail-sandbox/general/etc/dovecot/local.conf +++ /dev/null @@ -1,5 +0,0 @@ -disable_plaintext_auth = no -auth_mechanisms = plain login - -mail_location = maildir:~/.mail -listen = 0.0.0.0 diff --git a/provisioning/mail-sandbox/general/etc/roundcube/config.php b/provisioning/mail-sandbox/general/etc/roundcube/config.php deleted file mode 100644 index 2699a3ef6..000000000 --- a/provisioning/mail-sandbox/general/etc/roundcube/config.php +++ /dev/null @@ -1,18 +0,0 @@ - [ - 'verify_peer' => false, - 'verify_peer_name' => false, - 'allow_self_signed' => true, - ], -]; -$config['default_port'] = 143; -$config['smtp_port'] = 25; -$config['smtp_user'] = '%u'; -$config['smtp_pass'] = '%p'; - -$config['plugins'][] = 'webdevops_autologin'; diff --git a/provisioning/mail-sandbox/general/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php b/provisioning/mail-sandbox/general/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php deleted file mode 100644 index 97fbd5859..000000000 --- a/provisioning/mail-sandbox/general/etc/roundcube/plugins/webdevops_autologin/webdevops_autologin.php +++ /dev/null @@ -1,32 +0,0 @@ -add_hook('startup', array($this, 'startup')); - $this->add_hook('authenticate', array($this, 'authenticate')); - } - - function startup($args) - { - // change action to login - if (empty($_SESSION['user_id'])) { - $args['action'] = 'login'; - } - - return $args; - } - - function authenticate($args) { - $args['user'] = getenv('MAILBOX_USERNAME'); - $args['pass'] = getenv('MAILBOX_PASSWORD'); - $args['host'] = 'localhost'; - $args['cookiecheck'] = false; - $args['valid'] = true; - - return $args; - } -} diff --git a/provisioning/mail-sandbox/general/etc/supervisor.d/dovecot.conf b/provisioning/mail-sandbox/general/etc/supervisor.d/dovecot.conf deleted file mode 100644 index 26ae256b1..000000000 --- a/provisioning/mail-sandbox/general/etc/supervisor.d/dovecot.conf +++ /dev/null @@ -1,10 +0,0 @@ -[group:dovecot] -programs=dovecotd -priority=20 - -[program:dovecotd] -command = /opt/docker/bin/service.d/dovecot.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true diff --git a/provisioning/mail-sandbox/general/provision/bootstrap.d/.gitkeep b/provisioning/mail-sandbox/general/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/provisioning/mail-sandbox/general/provision/bootstrap.d/20-dovecot.sh b/provisioning/mail-sandbox/general/provision/bootstrap.d/20-dovecot.sh deleted file mode 100644 index 43fc1df22..000000000 --- a/provisioning/mail-sandbox/general/provision/bootstrap.d/20-dovecot.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# Setup local configuration -ln -sf /opt/docker/etc/dovecot/local.conf /etc/dovecot/local.conf diff --git a/provisioning/mail-sandbox/general/provision/bootstrap.d/20-postfix.sh b/provisioning/mail-sandbox/general/provision/bootstrap.d/20-postfix.sh deleted file mode 100644 index a84b55dff..000000000 --- a/provisioning/mail-sandbox/general/provision/bootstrap.d/20-postfix.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Create empty recipient_canonical_maps -touch /etc/postfix/recipient_canonical_maps - -# Configuration -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*smtpd_banner[\s]*=' -r 'smtpd_banner = myhostname ESMTP' \ - -s '^[\s#]*inet_interfaces[\s]*=' -r 'inet_interfaces = all' \ - -s '^[\s#]*inet_protocols[\s]*=' -r 'inet_protocols = ipv4' \ - -s '^[\s#]*home_mailbox[\s]*=' -r 'home_mailbox = .mail/' \ - -s '^[\s#]*mynetworks[\s]*=' -r 'mynetworks = 127.0.0.0/8 [::1]/128 0.0.0.0/0 [::1]/0' \ - -s '^[\s#]*mydestination[\s]*=' -r 'mydestination = localhost' \ - -s '^[\s#]*message_size_limit[\s]*=' -r 'message_size_limit = 102400000' \ - -s '^[\s#]*recipient_canonical_maps[\s]*=' -r 'recipient_canonical_maps = regexp:/etc/postfix/recipient_canonical_maps' \ - -- /etc/postfix/main.cf - -# Setup listening on port 1025 -echo "1025 inet n - y - - smtpd" >> /etc/postfix/master.cf diff --git a/provisioning/mail-sandbox/general/provision/entrypoint.d/20-mail-sandbox.sh b/provisioning/mail-sandbox/general/provision/entrypoint.d/20-mail-sandbox.sh deleted file mode 100644 index 06747a628..000000000 --- a/provisioning/mail-sandbox/general/provision/entrypoint.d/20-mail-sandbox.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -if ! id -u "$MAILBOX_USERNAME" > /dev/null 2>&1; then - # Add group - groupadd "$MAILBOX_USERNAME" - - # Add user - useradd --create-home --shell /bin/bash --no-user-group "$MAILBOX_USERNAME" - - # Assign user to group - usermod -g "$MAILBOX_USERNAME" "$MAILBOX_USERNAME" -fi - -# Set passwords -echo "$MAILBOX_USERNAME":"$MAILBOX_PASSWORD" | chpasswd - -# Create mailbox -mkdir -p -- \ - "~${MAILBOX_USERNAME}" \ - "~${MAILBOX_USERNAME}/.mail" \ - "~${MAILBOX_USERNAME}/.mail/Archive" \ - "~${MAILBOX_USERNAME}/.mail/Drafts" \ - "~${MAILBOX_USERNAME}/.mail/Sent" \ - "~${MAILBOX_USERNAME}/.mail/Spam" \ - "~${MAILBOX_USERNAME}/.mail/Tash" - -# Fix permissions -chown -R "${MAILBOX_USERNAME}:${MAILBOX_USERNAME}" -- "~${MAILBOX_USERNAME}" diff --git a/provisioning/mail-sandbox/general/provision/entrypoint.d/20-postfix.sh b/provisioning/mail-sandbox/general/provision/entrypoint.d/20-postfix.sh deleted file mode 100644 index 31dd03bdb..000000000 --- a/provisioning/mail-sandbox/general/provision/entrypoint.d/20-postfix.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# setup mailname -hostname > /etc/mailname - -# Create recipient_canonical_maps (redirect mails to local sandbox) -echo "/^.*$/ ${MAILBOX_USERNAME}@localhost" > /etc/postfix/recipient_canonical_maps -chown root:root /etc/postfix/recipient_canonical_maps -chmod 0644 /etc/postfix/recipient_canonical_maps -postmap /etc/postfix/recipient_canonical_maps diff --git a/provisioning/piwik/general/bin/piwik-cron.sh b/provisioning/piwik/general/bin/piwik-cron.sh deleted file mode 100644 index df0e88b28..000000000 --- a/provisioning/piwik/general/bin/piwik-cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. /opt/docker/bin/piwik-env.sh - -/usr/bin/php /app/code/piwik/console core:archive --url="$PIWIK_URL" diff --git a/provisioning/piwik/general/bin/piwik-env.sh b/provisioning/piwik/general/bin/piwik-env.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/provisioning/piwik/general/bin/piwik-env.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/provisioning/piwik/general/etc/cron/crontab b/provisioning/piwik/general/etc/cron/crontab deleted file mode 100644 index aa65b6d98..000000000 --- a/provisioning/piwik/general/etc/cron/crontab +++ /dev/null @@ -1 +0,0 @@ -5 * * * * application bash /opt/docker/bin/piwik-cron.sh &> /dev/null diff --git a/provisioning/piwik/general/etc/php/php.ini b/provisioning/piwik/general/etc/php/php.ini deleted file mode 100644 index 1267427ea..000000000 --- a/provisioning/piwik/general/etc/php/php.ini +++ /dev/null @@ -1,40 +0,0 @@ -; ------------------------------------- -; PRODUCTION configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 - -short_open_tag = On -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 900 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -date.timezone = Europe/Berlin - -mysql.default_host = mysql -mysqli.default_host = mysql - -; Zend OPCache -opcache.enable = 1 -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 10000 -opcache.fast_shutdown = 1 -opcache.enable_cli = 1 -opcache.revalidate_freq = 2 -opcache.validate_timestamps = 1 - -; XDebug -xdebug.remote_enable = 0 -xdebug.remote_connect_back = off diff --git a/provisioning/piwik/general/provision/entrypoint.d/10-piwik-env.sh b/provisioning/piwik/general/provision/entrypoint.d/10-piwik-env.sh deleted file mode 100644 index b1a540d55..000000000 --- a/provisioning/piwik/general/provision/entrypoint.d/10-piwik-env.sh +++ /dev/null @@ -1 +0,0 @@ -export|grep PIWIK > /opt/docker/bin/piwik-env.sh diff --git a/provisioning/postfix/general/provision/bootstrap.d/.gitkeep b/provisioning/postfix/general/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/provisioning/samson-deployment/general/bin/samson-cleanup-db.sh b/provisioning/samson-deployment/general/bin/samson-cleanup-db.sh deleted file mode 100644 index 09dc0cb5e..000000000 --- a/provisioning/samson-deployment/general/bin/samson-cleanup-db.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ -d "/storage/db/" ]]; then - find /storage/db/ -iname "*.sqlite3" | while read SQLITE_DATABSE; do - if [[ "$SQLITE_CLEANUP_DAYS" -gt 0 ]]; then - echo "Cleanup old deployment job logs (older than ${SQLITE_CLEANUP_DAYS} days)" - sqlite3 "$SQLITE_DATABSE" "UPDATE jobs SET output = '# Log cleared' WHERE created_at <= date('now', '-${SQLITE_CLEANUP_DAYS} day');" || echo " -> ERROR: Cleanup failed" - fi - - echo "Running VACUUM on $SQLITE_DATABSE" - sqlite3 "$SQLITE_DATABSE" "VACUUM;" || echo " -> ERROR: VACUUM failed" - done -fi diff --git a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 47e13a4d4..000000000 --- a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/provisioning/samson-deployment/general/bin/service.d/nginx.sh b/provisioning/samson-deployment/general/bin/service.d/nginx.sh deleted file mode 100644 index f5cd26167..000000000 --- a/provisioning/samson-deployment/general/bin/service.d/nginx.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx diff --git a/provisioning/samson-deployment/general/bin/service.d/samson.d/10-init.sh b/provisioning/samson-deployment/general/bin/service.d/samson.d/10-init.sh deleted file mode 100644 index 24a053a6d..000000000 --- a/provisioning/samson-deployment/general/bin/service.d/samson.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -############################# -# Vacuum database -############################# - -if [[ -x "/opt/docker/bin/samson-cleanup-db.sh" ]]; then - /opt/docker/bin/samson-cleanup-db.sh -fi diff --git a/provisioning/samson-deployment/general/bin/service.d/samson.sh b/provisioning/samson-deployment/general/bin/service.d/samson.sh deleted file mode 100644 index ef42ef789..000000000 --- a/provisioning/samson-deployment/general/bin/service.d/samson.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/samson.d/" - -sleep 1 - -echo "(Re-)Starting Samson" -cd /app/ -bin/rake db:migrate -exec bundle exec puma -C ./config/puma.rb -e "$RAILS_ENV" - - diff --git a/provisioning/samson-deployment/general/etc/nginx/vhost.conf b/provisioning/samson-deployment/general/etc/nginx/vhost.conf deleted file mode 100644 index 3d6624e55..000000000 --- a/provisioning/samson-deployment/general/etc/nginx/vhost.conf +++ /dev/null @@ -1,38 +0,0 @@ -upstream app { - server 127.0.0.1:9080; - keepalive 16; -} - -server { - listen 80; - server_name localhost; - - root /app/public/assets/; - - try_files $uri/index.html $uri @app; - - location @app { - proxy_pass http://app; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_buffering off; - proxy_redirect off; - proxy_read_timeout 300s; - - # Enable live streaming - proxy_http_version 1.1; - proxy_set_header Connection ""; - } - - location /500.html { - } - - location /502.html { - } - - error_page 500 503 504 /500.html; - error_page 502 /502.html; - - client_max_body_size 4G; - keepalive_timeout 10; -} diff --git a/provisioning/samson-deployment/general/etc/supervisor.d/docker.conf b/provisioning/samson-deployment/general/etc/supervisor.d/docker.conf deleted file mode 100644 index 519d04e46..000000000 --- a/provisioning/samson-deployment/general/etc/supervisor.d/docker.conf +++ /dev/null @@ -1,12 +0,0 @@ -[group:docker] -programs=dockerd -priority=25 - -[program:dockerd] -command = /usr/bin/docker daemon -autostart = false -autorestart = false -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/provisioning/samson-deployment/general/etc/supervisor.d/nginx.conf b/provisioning/samson-deployment/general/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/provisioning/samson-deployment/general/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/provisioning/samson-deployment/general/etc/supervisor.d/samson.conf b/provisioning/samson-deployment/general/etc/supervisor.d/samson.conf deleted file mode 100644 index 609c2ae1c..000000000 --- a/provisioning/samson-deployment/general/etc/supervisor.d/samson.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:samson] -programs=samsond -priority=25 - -[program:samsond] -command = /opt/docker/bin/service.d/samson.sh -user = application -environment = HOME="/home/application",USER="application,LC_CTYPE="en_US.UTF-8" -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/defaults/main.yml b/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/defaults/main.yml deleted file mode 100644 index 52f577b63..000000000 --- a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" -APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" diff --git a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml b/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml deleted file mode 100644 index 259464e7f..000000000 --- a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- name: Add application to docker group - user: - name: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - groups: "docker" - append: yes - -- name: Fix permissions - file: - path: "/app" - owner: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - recurse: yes - -- name: Diable nginx demonize mode - lineinfile: - dest: /etc/nginx/nginx.conf - regexp: '[\s;]*{{ item.key }}[\s]*' - line: '{{ item.key }} {{ item.value }};' - with_items: - - { key: 'daemon', value: 'off' } - -- name: Enable nginx main config - file: - src: '/opt/docker/etc/nginx/vhost.conf' - dest: '/etc/nginx/sites-available/default' - state: link - force: yes - -- name: Fix permissions of public and asset directories - command: find /app/public -type d -exec chmod -c 0755 {} \; - -- name: Fix permissions of public and asset files - command: find /app/public -type f -exec chmod -c 0644 {} \; - -- name: Fix owner of public and asset files - command: chown -R '{{ APPLICATION_USER }}:{{ APPLICATION_GROUP }}' /app/public - -- name: Remove old log directory - file: - path: "/var/lib/nginx/logs" - state: absent - -- name: Create log directory - file: - path: "/var/lib/nginx/logs" - state: directory - -- name: Create stdout symlinks - file: - dest: "{{ item }}" - src: "/docker.stdout" - state: link - force: yes - with_items: - - "/var/lib/nginx/logs/access.log" - - "/var/lib/nginx/logs/error.log" - -- name: Create storage directories - file: - path: "{{ item }}" - state: directory - owner: "{{ APPLICATION_USER }}" - group: "{{ APPLICATION_GROUP }}" - mode: u=rwX,g=rX,o=rX - recurse: yes - with_items: - - "/storage" - - "/storage/db" diff --git a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml b/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml deleted file mode 100644 index cd21505a4..000000000 --- a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/entrypoint.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- - diff --git a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/main.yml b/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/main.yml deleted file mode 100644 index 7895a52a9..000000000 --- a/provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- include: bootstrap.yml - tags: - - bootstrap - -- include: entrypoint.yml - tags: - - entrypoint diff --git a/provisioning/typo3/general/provision/bootstrap.d/.gitkeep b/provisioning/typo3/general/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh b/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh deleted file mode 100644 index 8879926cd..000000000 --- a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -if [[ -n "$VARNISH_CONFIG" ]]; then - echo " Using CUSTOM varnish configuration file" - - if [[ ! -f "$VARNISH_CONFIG" ]]; then - echo "[ERROR] Varnish configuration file '${VARNISH_CONFIG}' not found" - exit 1 - fi -else - echo "Using DEFAULT varnish configuration" - - VARNISH_CONFIG="/opt/docker/etc/varnish/varnish.vcl" - - if [[ -z "$VARNISH_BACKEND_HOST" ]]; then - echo "[ERROR] No varnish backend host set (VARNISH_BACKEND_HOST)" - exit 1 - fi - - if [[ -z "$VARNISH_BACKEND_PORT" ]]; then - echo "[ERROR] No varnish backend port set (VARNISH_BACKEND_PORT)" - exit 1 - fi -fi - -if [[ -z "$VARNISH_STORAGE" ]]; then - "[ERROR] No varnish storage definition set (VARNISH_STORAGE)" - exit 1 -fi - -if [[ -z "$VARNISH_PORT" ]]; then - "[ERROR] No varnish listen port set (VARNISH_PORT)" - exit 1 -fi - -go-replace \ - -s "" -r "$VARNISH_BACKEND_HOST" \ - -s "" -r "$VARNISH_BACKEND_PORT" \ - -- "$VARNISH_CONFIG" - -echo " Starting varnishd..." -echo " listening on: 0.0.0.0:${VARNISH_PORT}" -echo " config file: ${VARNISH_CONFIG}" -echo " backend: ${VARNISH_BACKEND_HOST}:${VARNISH_BACKEND_PORT}" -echo " storage: ${VARNISH_STORAGE}" -echo " varnishd opts: ${VARNISH_OPTS}" -echo "" - -exec varnishd -j unix,user=varnish -F \ - -a "0.0.0.0:${VARNISH_PORT}" \ - -f "$VARNISH_CONFIG" \ - -s "$VARNISH_STORAGE" \ - $VARNISH_OPTS diff --git a/provisioning/varnish/general/etc/varnish/varnish.vcl b/provisioning/varnish/general/etc/varnish/varnish.vcl deleted file mode 100644 index 0f0932b8f..000000000 --- a/provisioning/varnish/general/etc/varnish/varnish.vcl +++ /dev/null @@ -1,9 +0,0 @@ -vcl 4.0; - -import std; -import directors; - -backend default { - .host = ""; - .port = ""; -} diff --git a/sandbox/Dockerfile b/sandbox/Dockerfile deleted file mode 100644 index 5a3295285..000000000 --- a/sandbox/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -#FROM webdevops/bootstrap:centos-7 -#FROM webdevops/bootstrap:debian-7 -#FROM webdevops/bootstrap:debian-8 -#FROM webdevops/bootstrap:debian-=9 -#FROM webdevops/bootstrap:ubuntu-12.04 -#FROM webdevops/bootstrap:ubuntu-14.04 -#FROM webdevops/bootstrap:ubuntu-15.04 -#FROM webdevops/bootstrap:ubuntu-15.10 -#FROM webdevops/bootstrap:ubuntu-16.04 - -#FROM webdevops/base:centos-7 -#FROM webdevops/base:debian-7 -#FROM webdevops/base:debian-8 -#FROM webdevops/base:debian-9 -#FROM webdevops/base:ubuntu-12.04 -#FROM webdevops/base:ubuntu-14.04 -#FROM webdevops/base:ubuntu-15.04 -#FROM webdevops/base:ubuntu-15.10 -#FROM webdevops/base:ubuntu-16.04 - -#FROM webdevops/php:centos-7 -#FROM webdevops/php:debian-7 -#FROM webdevops/php:debian-8 -#FROM webdevops/php:debian-8-php7 -#FROM webdevops/php:debian-9 -#FROM webdevops/php:debian-9-php7 -#FROM webdevops/php:ubuntu-12.04 -#FROM webdevops/php:ubuntu-14.04 -#FROM webdevops/php:ubuntu-15.04 -#FROM webdevops/php:ubuntu-15.10 -#FROM webdevops/php:ubuntu-16.04 -#FROM webdevops/php:ubuntu-16.04-php7 - -#FROM webdevops/apache:centos-7 -#FROM webdevops/apache:debian-7 -#FROM webdevops/apache:debian-8 -#FROM webdevops/apache:debian-8-php7 -#FROM webdevops/apache:debian-9 -#FROM webdevops/apache:debian-9-php7 -#FROM webdevops/apache:ubuntu-12.04 -#FROM webdevops/apache:ubuntu-14.04 -#FROM webdevops/apache:ubuntu-15.04 -#FROM webdevops/apache:ubuntu-15.10 -#FROM webdevops/apache:ubuntu-16.04 - -#FROM webdevops/nginx:alpine-3 -#FROM webdevops/nginx:centos-7 -#FROM webdevops/nginx:debian-7 -#FROM webdevops/nginx:debian-8 -#FROM webdevops/nginx:debian-8-php7 -#FROM webdevops/nginx:debian-9 -#FROM webdevops/nginx:debian-9-php7 -#FROM webdevops/nginx:ubuntu-12.04 -#FROM webdevops/nginx:ubuntu-14.04 -#FROM webdevops/nginx:ubuntu-15.04 -#FROM webdevops/nginx:ubuntu-15.10 -#FROM webdevops/nginx:ubuntu-16.04 - -#FROM webdevops/php-apache:centos-7 -#FROM webdevops/php-apache:debian-7 -#FROM webdevops/php-apache:debian-8 -#FROM webdevops/php-apache:debian-8-php7 -#FROM webdevops/php-apache:debian-9 -#FROM webdevops/php-apache:debian-9-php7 -#FROM webdevops/php-apache:ubuntu-12.04 -#FROM webdevops/php-apache:ubuntu-14.04 -#FROM webdevops/php-apache:ubuntu-15.04 -#FROM webdevops/php-apache:ubuntu-15.10 -#FROM webdevops/php-apache:ubuntu-16.04 -#FROM webdevops/php-apache:ubuntu-16.04-php7 - -#FROM webdevops/php-nginx:centos-7 -#FROM webdevops/php-nginx:debian-7 -#FROM webdevops/php-nginx:debian-8 -#FROM webdevops/php-nginx:debian-8-php7 -#FROM webdevops/php-nginx:debian-9 -#FROM webdevops/php-nginx:debian-9-php7 -#FROM webdevops/php-nginx:ubuntu-12.04 -#FROM webdevops/php-nginx:ubuntu-14.04 -#FROM webdevops/php-nginx:ubuntu-15.04 -#FROM webdevops/php-nginx:ubuntu-15.10 -#FROM webdevops/php-nginx:ubuntu-16.04 -#FROM webdevops/php-nginx:ubuntu-16.04-php7 - -#FROM webdevops/hhvm -#FROM webdevops/hhvm-apache -#FROM webdevops/hhvm-nginx - -#FROM webdevops/postfix -#FROM webdevops/ssh -#FROM webdevops/storage -#FROM webdevops/vsftp -#FROM webdevops/mail-sandbox - -#FROM webdevops/typo3 -#FROM webdevops/piwik diff --git a/sandbox/code/index.php b/sandbox/code/index.php deleted file mode 100644 index e974c40df..000000000 --- a/sandbox/code/index.php +++ /dev/null @@ -1 +0,0 @@ -> /etc/apt/sources.list \ - && apt-install \ - hhvm=3.* \ - imagemagick \ - graphicsmagick \ - ghostscript \ - && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 -{%- endmacro %} - - -{% macro ubuntu16(role='') -%} - # Install hhvm environment - && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 \ - && echo "deb http://dl.hhvm.com/ubuntu $(docker-image-info dist-codename) main" >> /etc/apt/sources.list \ - && apt-install \ - hhvm=3.* \ - imagemagick \ - graphicsmagick \ - ghostscript \ - && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 -{%- endmacro %} diff --git a/template/Dockerfile/images/liquibase.jinja2 b/template/Dockerfile/images/liquibase.jinja2 deleted file mode 100644 index f4ca42c41..000000000 --- a/template/Dockerfile/images/liquibase.jinja2 +++ /dev/null @@ -1,44 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro mysql(role='') -%} - && apt-get update \ - && apt-get install -yq --no-install-recommends \ - libmariadb-java \ - && wget -q -O/tmp/liquibase.tar.gz "https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}-bin.tar.gz" \ - && mkdir -p /opt/liquibase \ - && tar -xzf /tmp/liquibase.tar.gz -C /opt/liquibase \ - && rm -f /tmp/liquibase.tar.gz \ - && chmod +x /opt/liquibase/liquibase \ - && ln -s /opt/liquibase/liquibase /usr/local/bin/ \ - && chmod +x /opt/docker/bin/entrypoint.sh \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* \ - && mkdir /liquibase \ - && ln -sf /opt/docker/bin/entrypoint.sh /entrypoint \ - # cleanup - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* -{%- endmacro %} - -{% macro postgres(role='') -%} - && apt-get update \ - && apt-get install -yq --no-install-recommends \ - libpostgresql-jdbc-java \ - && wget -q -O/tmp/liquibase.tar.gz "https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}-bin.tar.gz" \ - && mkdir -p /opt/liquibase \ - && tar -xzf /tmp/liquibase.tar.gz -C /opt/liquibase \ - && rm -f /tmp/liquibase.tar.gz \ - && chmod +x /opt/liquibase/liquibase \ - && ln -s /opt/liquibase/liquibase /usr/local/bin/ \ - && chmod +x /opt/docker/bin/entrypoint.sh \ - && apt-get clean \ - && rm -r /var/lib/apt/lists/* \ - && mkdir /liquibase \ - && ln -sf /opt/docker/bin/entrypoint.sh /entrypoint \ - # cleanup - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* -{%- endmacro %} diff --git a/template/Dockerfile/images/liquidsoap.jinja2 b/template/Dockerfile/images/liquidsoap.jinja2 deleted file mode 100644 index cce49c8a0..000000000 --- a/template/Dockerfile/images/liquidsoap.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro ubuntu(role='') -%} - # Install services - && apt-install \ - liquidsoap -{%- endmacro %} diff --git a/template/Dockerfile/images/mail-sandbox.jinja2 b/template/Dockerfile/images/mail-sandbox.jinja2 deleted file mode 100644 index db6cc5012..000000000 --- a/template/Dockerfile/images/mail-sandbox.jinja2 +++ /dev/null @@ -1,24 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro ubuntu(role='') -%} - # Install services - && apt-install \ - dovecot-core \ - dovecot-imapd \ - && docker-service enable postfix \ - && docker-service enable dovecot -{%- endmacro %} - -{% macro roundcube(role='') -%} - # Install Roundcube + plugins - && cd /app \ - && rm -rf * \ - && wget https://github.com/roundcube/roundcubemail/releases/download/1.2.2/roundcubemail-1.2.2-complete.tar.gz \ - && tar xf roundcubemail-1.2.2-complete.tar.gz --strip-components 1 \ - && rm -f roundcubemail-1.2.2-complete.tar.gz \ - && ls -l \ - && rm -rf .git installer \ - && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ - && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php -{%- endmacro %} diff --git a/template/Dockerfile/images/nginx-dev.jinja2 b/template/Dockerfile/images/nginx-dev.jinja2 deleted file mode 100644 index 6c99ac2f3..000000000 --- a/template/Dockerfile/images/nginx-dev.jinja2 +++ /dev/null @@ -1,3 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 deleted file mode 100644 index b41ac016b..000000000 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ /dev/null @@ -1,89 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - - -{% macro alpine(role='') -%} - # Install development environment - && apk-install \ - # Install tools - graphviz \ - # Tools - nano \ - vim \ - && apk-install gcc php5-dev autoconf --virtual .pecl-deps \ - && pecl install xdebug-2.5.5 \ - && apk del .pecl-deps \ - {{ services.phpDev() }} -{%- endmacro %} - - -{% macro centos(role='') -%} - # Install development environment - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro webtatic(role='') -%} - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php56w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro debian(role='') -%} - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - - -{% macro ubuntu(role='') -%} - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 deleted file mode 100644 index 10cd259f5..000000000 --- a/template/Dockerfile/images/php5.jinja2 +++ /dev/null @@ -1,470 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - -{% macro alpine(role='') -%} - # Install php environment - && apk-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysql \ - php5-mysqli \ - php5-pdo_mysql \ - php5-pdo_pgsql \ - php5-pdo_sqlite \ - php5-mcrypt \ - php5-gd \ - php5-bcmath \ - php5-soap \ - php5-sqlite3 \ - php5-bz2 \ - php5-calendar \ - php5-ctype \ - php5-mongodb \ - php5-pcntl \ - php5-pgsql \ - php5-posix \ - php5-sockets \ - php5-sysvmsg \ - php5-sysvsem \ - php5-sysvshm \ - php5-xmlreader \ - php5-exif \ - php5-ftp \ - php5-gettext \ - php5-iconv \ - php5-zip \ - php5-zlib \ - php5-shmop \ - php5-wddx \ - sqlite \ - php5-xmlrpc \ - php5-xsl \ - geoip \ - php5-ldap \ - # php5-memcache \ - php5-redis \ - php5-pear \ - php5-phar \ - php5-openssl \ - # php5-apcu \ - && ln -s /usr/bin/php5 /usr/bin/php \ - && ln -s /usr/sbin/php-fpm5 /usr/sbin/php-fpm \ - && ln -s /usr/bin/phpize5 /usr/sbin/phpize \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # PECL workaround, see webdevops/Dockerfile#78 - && sed -i "s/ -n / /" $(which pecl) \ - # && apk-install gcc php5-dev autoconf --virtual .pecl-deps \ - # && go-replace -v -s 'expr -- [$]0 : "'\''.*"' -r 'expr " [$]0" : " '\''.*"' -- /usr/lib/php/build/acinclude.m4 - # && pecl install apcu-4.0.11 \ - # && apk del .pecl-deps \ - {{ services.php() }} -{%- endmacro %} - - -{% macro centos(role='') -%} - # Install php environment - && yum-install \ - # Install tools - ImageMagick \ - GraphicsMagick \ - ghostscript \ - # Install php (cli/fpm) - php-cli \ - php-fpm \ - php-json \ - php-intl \ - php-imap \ - php-curl \ - php-mysqlnd \ - php-mongodb \ - php-memcached \ - php-mcrypt \ - php-gd \ - php-pgsql \ - php-mbstring \ - php-bcmath \ - php-soap \ - sqlite \ - php-xmlrpc \ - php-xsl \ - geoip \ - php-ldap \ - php-memcache \ - php-pecl-redis \ - ImageMagick \ - ImageMagick-devel \ - ImageMagick-perl \ - php-pear \ - php-pecl-apcu \ - php-devel \ - gcc \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && pecl install imagick \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Cleanup - && yum erase -y php-devel gcc \ - {{ services.php() }} -{%- endmacro %} - -{% macro centosWebtatic(role='') -%} - && rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ - && yum-install \ - ImageMagick \ - GraphicsMagick \ - ghostscript \ - php56w-cli \ - php56w-fpm \ - php56w-common \ - php56w-intl \ - php56w-imap \ - php56w-mysqlnd \ - php56w-pecl-memcached \ - php56w-mongodb \ - php56w-mcrypt \ - php56w-gd \ - php56w-pgsql \ - php56w-mbstring \ - php56w-bcmath \ - php56w-soap \ - sqlite \ - php56w-xmlrpc \ - php56w-xml \ - geoip \ - php56w-ldap \ - ImageMagick-devel \ - ImageMagick-perl \ - php56w-pear \ - php56w-devel \ - gcc \ - make \ - php56w-opcache \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && sed -i "$ s|\-n||g" /usr/bin/pecl \ - && pecl install imagick \ - # && pecl install redis \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Cleanup - && yum erase -y php-devel gcc \ - {{ services.php() }} -{%- endmacro %} - -{% macro debian7(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - - -{% macro debian8(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - - -{% macro debian9(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - #php-memcached \ - php5-imagick \ - #php5-redis \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro debian10(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - #php-memcached \ - php5-imagick \ - #php5-redis \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro ubuntu12(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - #php-memcached \ - php5-imagick \ - #php5-redis \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - - -{% macro ubuntu14(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongo \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-memcached \ - php5-imagick \ - php5-redis \ - php5-apcu \ - php-pear \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro ubuntu16(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - # Install php (cli/fpm) - php5-cli \ - php5-fpm \ - php5-json \ - php5-intl \ - php5-imap \ - php5-curl \ - php5-mysqlnd \ - php5-mongodb \ - php5-mcrypt \ - php5-gd \ - php5-sqlite \ - php5-pgsql \ - php5-xmlrpc \ - php5-xsl \ - php5-geoip \ - php5-ldap \ - php5-memcache \ - php5-imagick \ - php5-apcu \ - && pecl channel-update pecl.php.net \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ - && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 deleted file mode 100644 index 42d735b6c..000000000 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ /dev/null @@ -1,102 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - -{% macro alpine(role='') -%} - # Install development environment - && apk-install \ - # Install tools - graphviz \ - # Install php development stuff - php7-xdebug \ - {{ services.phpDev() }} -{%- endmacro %} - - -{% macro centos(role='') -%} -# Install development environment - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php7-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro webtatic(role='') -%} - && wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ - && yum-install \ - # Install tools - graphviz \ - # Install php development stuff - php70w-pecl-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro debian(role='') -%} - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro debianSury(role='') -%} - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php7.0-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} - -{% macro ubuntu(role='') -%} - # Install development environment - && apt-install \ - gnupg \ - && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ - && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ - && apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php-xdebug \ - blackfire-php \ - blackfire-agent \ - # Tools - nano \ - vim \ - {{ services.phpDev() }} -{%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 deleted file mode 100644 index 88c5e632f..000000000 --- a/template/Dockerfile/images/php7.jinja2 +++ /dev/null @@ -1,354 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - -{% macro alpine(role='') -%} - # Install php environment - && apk-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - libjpeg-turbo-utils \ - optipng \ - pngquant \ - # Install php (cli/fpm) - php7-fpm \ - php7-json \ - php7-intl \ - php7-curl \ - php7-mysqli \ - php7-mysqlnd \ - php7-pdo_mysql \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-mcrypt \ - php7-gd \ - # disabled until Imagick was compiled against Image Magick version 1799 but version 1800 is loaded is fixed - php7-imagick \ - php7-imap \ - php7-bcmath \ - php7-soap \ - php7-sqlite3 \ - php7-bz2 \ - php7-calendar \ - php7-ctype \ - php7-mongodb \ - php7-pcntl \ - php7-pgsql \ - php7-posix \ - php7-sockets \ - php7-sysvmsg \ - php7-sysvsem \ - php7-sysvshm \ - php7-xmlreader \ - php7-exif \ - php7-ftp \ - php7-gettext \ - php7-iconv \ - php7-zip \ - php7-zlib \ - php7-shmop \ - php7-wddx \ - sqlite \ - php7-xmlrpc \ - php7-xsl \ - geoip \ - php7-ldap \ - # php7-memcache \ - php7-redis \ - php7-pear \ - php7-phar \ - php7-openssl \ - php7-session \ - php7-opcache \ - php7-mbstring \ - php7-iconv \ - php7-apcu \ - php7-fileinfo \ - php7-simplexml \ - php7-tokenizer \ - php7-xmlwriter \ -<<<<<<< HEAD - php7-pecl-amqp \ -======= - php7-pecl-amqp ->>>>>>> f22c2209 (Add amqp to build) - && ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm \ - && pecl channel-update pecl.php.net \ - # Temporarily disable pear due to https://twitter.com/pear/status/1086634389465956352 - # && pear channel-update pear.php.net \ - # && pear upgrade-all \ - && pear config-set auto_discover 1 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # PECL workaround, see webdevops/Dockerfile#78 - && sed -i "s/ -n / /" $(which pecl) \ - {{ services.php() }} -{%- endmacro %} - -{% macro debianSury(distribution,role='') -%} - && apt-install apt-transport-https lsb-release \ - && echo "deb https://packages.sury.org/php/ {{ distribution }} main" >> /etc/apt/sources.list \ - && echo "deb http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \ - && echo "deb-src http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \ - && wget -O- https://packages.sury.org/php/apt.gpg | apt-key add - \ - && echo "Package: *" > /etc/apt/preferences.d/debian_testing.pref \ - && echo "Pin: origin ftp2.de.debian.org" >> /etc/apt/preferences.d/debian_testing.pref \ - && echo "Pin-Priority: -10" >> /etc/apt/preferences.d/debian_testing.pref \ - && echo "Package: libpcre3" > /etc/apt/preferences.d/libpcre.pref \ - && echo "Pin: release a=testing" >> /etc/apt/preferences.d/libpcre.pref \ - && echo "Pin-Priority: 995" >> /etc/apt/preferences.d/libpcre.pref \ - && apt-get update \ - && apt-get -t testing install -y -f libpcre3 \ - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-imagick \ - php7.0-imap \ - php7.0-sqlite3 \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php7.0-redis \ - php7.0-memcached \ - php7.0-zip \ - php7.0-soap \ - php7.0-bcmath \ - php7.0-mbstring \ - php-mongodb \ - php-apcu \ - php-amqp \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro debian9(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-imagick \ - php7.0-imap \ - php7.0-sqlite3 \ - php7.0-pgsql \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-soap \ - php7.0-zip \ - php7.0-mbstring \ - php7.0-bcmath \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php-pear \ - php-apcu \ - php-redis \ - php-mongodb \ - php-memcache \ - php-memcached \ - php-amqp \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro debian10(role='') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) | php always references the latest version - php-cli \ - php-fpm \ - php-json \ - php-intl \ - php-curl \ - php-mysql \ - php-gd \ - php-imagick \ - php-imap \ - php-sqlite3 \ - php-pgsql \ - php-ldap \ - php-opcache \ - php-soap \ - php-zip \ - php-mbstring \ - php-bcmath \ - php-xmlrpc \ - php-xsl \ - php-bz2 \ - php-pear \ - php-apcu \ - php-redis \ - php-mongodb \ - php-memcache \ - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro ubuntu(role='', phpVersion='7.0') -%} - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php{{ phpVersion }}-cli \ - php{{ phpVersion }}-fpm \ - php{{ phpVersion }}-json \ - php{{ phpVersion }}-intl \ - php{{ phpVersion }}-curl \ - php{{ phpVersion }}-mysql \ -{%- if phpVersion == '7.0' %} - php{{ phpVersion }}-mcrypt \ -{%- endif %} - php{{ phpVersion }}-gd \ - php{{ phpVersion }}-sqlite3 \ - php{{ phpVersion }}-imap \ - php{{ phpVersion }}-pgsql \ - php{{ phpVersion }}-ldap \ - php{{ phpVersion }}-opcache \ - php{{ phpVersion }}-soap \ - php{{ phpVersion }}-zip \ - php{{ phpVersion }}-mbstring \ - php{{ phpVersion }}-bcmath \ - php{{ phpVersion }}-xmlrpc \ - php{{ phpVersion }}-xsl \ - php{{ phpVersion }}-bz2 \ - php-pear \ - php-apcu \ - php-igbinary \ - php-mongodb \ - php-imagick \ - php-redis \ - php-amqp \ -{%- if phpVersion == '7.1' %} - php-libsodium \ -{%- endif %} - php-memcached \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - {{ services.php() }} -{%- endmacro %} - -{% macro centosWebtatic(role='') -%} - && rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ - && yum-install \ - ImageMagick \ - GraphicsMagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-utils \ - optipng \ - pngcrush \ - pngnq \ - pngquant \ - # Install php (cli/fpm) - php70w-cli \ - php70w-fpm \ - php70w-common \ - php70w-intl \ - php70w-imap \ - php70w-mysqlnd \ - php70w-pecl-memcached \ - php70w-mcrypt \ - php70w-gd \ - php70w-pgsql \ - php70w-mbstring \ - php70w-bcmath \ - php70w-soap \ - php70w-pecl-apcu \ - sqlite \ - php70w-xmlrpc \ - php70w-xml \ - geoip \ - php70w-ldap \ - ImageMagick-devel \ - ImageMagick-perl \ - php70w-pear \ - php70w-devel \ - gcc \ - make \ - php70w-opcache \ - php70w-pecl-imagick \ - php70w-pecl-mongodb \ - && pecl channel-update pecl.php.net \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - && pecl install redis \ - && echo "extension=redis.so" > /etc/php.d/redis.ini \ - && yum remove -y ImageMagick-devel php70w-devel gcc make \ - {{ services.php() }} -{%- endmacro %} diff --git a/template/Dockerfile/images/piwik.jinja2 b/template/Dockerfile/images/piwik.jinja2 deleted file mode 100644 index 8467e2cda..000000000 --- a/template/Dockerfile/images/piwik.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - - -{% macro install() -%} - && mkdir -p /app/ \ - && wget -O/tmp/piwik.zip http://builds.piwik.org/piwik.zip \ - && unzip /tmp/piwik.zip -d /app/ \ - && rm -f /tmp/piwik.zip \ - && chown -R application /app \ - && find /app/ -type d -exec chmod 0755 {} \; \ - && find /app/ -type f -exec chmod 0644 {} \; -{%- endmacro %} diff --git a/template/Dockerfile/images/postfix.jinja2 b/template/Dockerfile/images/postfix.jinja2 deleted file mode 100644 index a47bc7357..000000000 --- a/template/Dockerfile/images/postfix.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro ubuntu(role='') -%} - && docker-service enable syslog \ - && docker-service enable postfix -{%- endmacro %} diff --git a/template/Dockerfile/images/samson-deployment.jinja2 b/template/Dockerfile/images/samson-deployment.jinja2 deleted file mode 100644 index e61fd29d9..000000000 --- a/template/Dockerfile/images/samson-deployment.jinja2 +++ /dev/null @@ -1,74 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro general(role='') -%} -ENV RAILS_ENV="production" - -ENV SQLITE_CLEANUP_DAYS=0 - -# NGINX reverse proxy -RUN export DEBIAN_FRONTEND=noninteractive && set -x \ - && echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list \ - && curl -fsSL https://yum.dockerproject.org/gpg | apt-key add - \ - && apt-install \ - # Install nginx - nginx \ - # Install docker - docker-engine \ - # Install php - php-cli \ - php-mysqlnd \ - php-mcrypt \ - php-curl \ - php-recode \ - php-json \ - # Install java - openjdk-8-jre \ - # SQlite 3 - sqlite3 \ - && pip install -U \ - docker-compose \ - python-dotenv \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ - ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* \ - {{ docker.cleanup() }} - -# NPM stack -RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ - && apt-get install -y nodejs \ - && npm install -g gulp \ - && npm install -g grunt-cli \ - && npm install -g bower \ - && npm install -g npm-cache \ - {{ docker.cleanup() }} - -# Deployer stack -RUN set -x \ - # Compiler stuff - && apt-install \ - build-essential \ - # Deployer: Ansistratno (https://github.com/ansistrano) - && ansible-galaxy install --force \ - ansistrano.deploy \ - ansistrano.rollback \ - # Deployer: PHP Deployer (http://deployer.org/) - && wget --quiet -O/usr/local/bin/dep http://deployer.org/deployer.phar \ - && chmod +x /usr/local/bin/dep \ - # Deployer: capistrano (http://capistranorb.com/) - && gem install capistrano \ - {{ docker.cleanup() }} - -# Upload -ADD database.yml /app/config/database.yml -ADD web/ /app/public/assets/ - -ADD crontab /etc/cron.d/webdevops-samson-deployment - -RUN rake assets:precompile \ - && docker-service enable cron \ - {{ provision.runRoleInline('samson-deployment', role) }} - - -{%- endmacro %} diff --git a/template/Dockerfile/images/sphinx.jinja2 b/template/Dockerfile/images/sphinx.jinja2 deleted file mode 100644 index 356974730..000000000 --- a/template/Dockerfile/images/sphinx.jinja2 +++ /dev/null @@ -1,31 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro alpine() -%} - && apk-install \ - # General python - python \ - py-crypto \ - py2-pip \ - # General sphinx - py-pillow \ - py-yaml \ - py-sphinx \ - py-sphinx_rtd_theme \ - # GRAPHVIZ - graphviz \ - ttf-dejavu \ - && pip install --upgrade pip \ - && hash -r \ - && pip install --upgrade sphinxcontrib-googlechart \ - && pip install --upgrade sphinxcontrib-googlemaps \ - && pip install --upgrade sphinxcontrib-httpdomain \ - && pip install --upgrade sphinxcontrib-slide \ - && pip install --upgrade sphinx-autobuild \ - && pip install --upgrade recommonmark \ - # TYPO3 stuff - && pip install t3SphinxThemeRtd \ - && pip install t3fieldlisttable \ - && pip install t3tablerows \ - && pip install t3targets -{%- endmacro %} diff --git a/template/Dockerfile/images/typo3-solr.jinja2 b/template/Dockerfile/images/typo3-solr.jinja2 deleted file mode 100644 index 2a4137af1..000000000 --- a/template/Dockerfile/images/typo3-solr.jinja2 +++ /dev/null @@ -1,59 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/baselayout.jinja2' as baselayout %} - -{% macro guywithnose(release) -%} -USER root - -COPY ./solr/ /tmp/solr - -{{ baselayout.copy() }} - -WORKDIR / - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && /usr/local/bin/generate-dockerimage-info \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-{{ release|replace(".", "_") }}/solr-typo3-plugin-{{ release }}.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ \ - {{ docker.cleanup() }} - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] -{%- endmacro %} - - -{% macro official(version) -%} -USER root - -{{ baselayout.copy() }} - -RUN apt-update \ - && apt-install net-tools \ - && generate-dockerimage-info \ - && mkdir /tmp/solr \ - && wget -O/tmp/solr/extension.tar.gz "https://github.com/TYPO3-Solr/ext-solr/archive/{{ version }}.tar.gz" \ - && cd /tmp/solr \ - && tar --strip 1 -zxf /tmp/solr/extension.tar.gz \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr/Resources/Private/Solr/ /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr \ - && chmod 755 /opt/solr/server/solr \ - && rm -rf /tmp/solr \ - {{ docker.cleanup() }} - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] -{%- endmacro %} diff --git a/template/Dockerfile/images/typo3.jinja2 b/template/Dockerfile/images/typo3.jinja2 deleted file mode 100644 index fd80b5ce5..000000000 --- a/template/Dockerfile/images/typo3.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} -{% import 'Dockerfile/services.jinja2' as services %} - - -{% macro install() -%} - && composer create-project typo3/cms-base-distribution /app/ \ - && touch /app/public/FIRST_INSTALL \ - && chown -R application /app \ - && find /app/ -type d -exec chmod 0755 {} \; \ - && find /app/ -type f -exec chmod 0644 {} \; -{%- endmacro %} diff --git a/template/Dockerfile/images/varnish.jinja2 b/template/Dockerfile/images/varnish.jinja2 deleted file mode 100644 index 019868240..000000000 --- a/template/Dockerfile/images/varnish.jinja2 +++ /dev/null @@ -1,19 +0,0 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} -{% import 'Dockerfile/provision.jinja2' as provision %} - -{% macro env() -%} -ENV VARNISH_PORT 80 - -ENV VARNISH_CONFIG "" -ENV VARNISH_STORAGE "malloc,128m" -ENV VARNISH_OPTS "" - -ENV VARNISH_BACKEND_HOST "" -ENV VARNISH_BACKEND_PORT "80" -{%- endmacro %} - - -{% macro alpine() -%} - && apk-install \ - varnish -{%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 8ec507050..fdd6465b2 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -5,33 +5,15 @@ {% import 'Dockerfile/tools.jinja2' as tools %} {% import 'Dockerfile/baselayout.jinja2' as baselayout %} -{% import 'Dockerfile/images/ansible.jinja2' as ansible %} {% import 'Dockerfile/images/bootstrap.jinja2' as bootstrap %} {% import 'Dockerfile/images/base.jinja2' as base %} {% import 'Dockerfile/images/baseapp.jinja2' as baseapp %} {% import 'Dockerfile/images/apache.jinja2' as apache %} -{% import 'Dockerfile/images/apache-dev.jinja2' as apachedev %} {% import 'Dockerfile/images/nginx.jinja2' as nginx %} -{% import 'Dockerfile/images/nginx-dev.jinja2' as nginxdev %} -{% import 'Dockerfile/images/hhvm.jinja2' as hhvm %} -{% import 'Dockerfile/images/postfix.jinja2' as postfix %} -{% import 'Dockerfile/images/liquidsoap.jinja2' as liquidsoap %} -{% import 'Dockerfile/images/mail-sandbox.jinja2' as mailsandbox %} {% import 'Dockerfile/images/php.jinja2' as php %} -{% import 'Dockerfile/images/php5.jinja2' as php5 %} -{% import 'Dockerfile/images/php7.jinja2' as php7 %} -{% import 'Dockerfile/images/php5-dev.jinja2' as php5dev %} -{% import 'Dockerfile/images/php7-dev.jinja2' as php7dev %} -{% import 'Dockerfile/images/piwik.jinja2' as piwik %} -{% import 'Dockerfile/images/sphinx.jinja2' as sphinx %} {% import 'Dockerfile/images/ssh.jinja2' as ssh %} {% import 'Dockerfile/images/vsftp.jinja2' as vsftp %} -{% import 'Dockerfile/images/samson-deployment.jinja2' as samsonDeployment %} -{% import 'Dockerfile/images/typo3.jinja2' as typo3 %} -{% import 'Dockerfile/images/typo3-solr.jinja2' as typo3Solr %} -{% import 'Dockerfile/images/varnish.jinja2' as varnish %} -{% import 'Dockerfile/images/certbot.jinja2' as certbot %} -{% import 'Dockerfile/images/liquibase.jinja2' as liquibase %} + #+++++++++++++++++++++++++++++++++++++++ # Dockerfile for webdevops/{{ Dockerfile.image }}:{{ Dockerfile.tag }} # -- automatically generated -- From 93cfe30c9f23334d5ca5b8175975059662505806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 13 Dec 2022 11:25:17 +0100 Subject: [PATCH 08/63] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8868e653a..c29b16623 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Introduction +# PHP docker images with super powers 🚀 We provide images which extend the official [PHP-Images](https://hub.docker.com/_/php/tags). We add additional stuff like: From 649dbc4e9a8c0dec67df0e3148e01bc65adb4384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 13 Dec 2022 11:41:38 +0100 Subject: [PATCH 09/63] fix: config --- conf/console.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/console.yml b/conf/console.yml index 31be20664..2a5ee2a05 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -28,8 +28,8 @@ dockerTest: configuration: imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-?(?P[^-]+)?' default: - OS_FAMILY: 'debian' - OS_VERSION: '11' + OS_FAMILY: 'ubuntu' + OS_VERSION: '22.04' image: 'php[^:]*:[0-9].[0-9]-alpine$': OS_FAMILY: 'alpine' From 8e1134b987423639651ed4df33b9b3534689e7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 13 Dec 2022 12:37:42 +0100 Subject: [PATCH 10/63] cleanup serverspec --- ci/src/JobBuilder.php | 3 - tests/serverspec/spec/collection/ansible.rb | 4 - tests/serverspec/spec/collection/certbot.rb | 6 - tests/serverspec/spec/collection/dovecot.rb | 9 -- tests/serverspec/spec/collection/hhvm.rb | 16 --- tests/serverspec/spec/collection/liquibase.rb | 4 - .../serverspec/spec/collection/liquidsoap.rb | 4 - tests/serverspec/spec/collection/php-fpm5.rb | 44 -------- tests/serverspec/spec/collection/php5.rb | 29 ----- tests/serverspec/spec/collection/postfix.rb | 9 -- .../spec/collection/samson-deployment.rb | 16 --- tests/serverspec/spec/collection/sphinx.rb | 4 - .../serverspec/spec/collection/typo3-solr.rb | 9 -- tests/serverspec/spec/collection/varnish.rb | 7 -- tests/serverspec/spec/docker/ansible_spec.rb | 13 --- tests/serverspec/spec/docker/certbot_spec.rb | 14 --- .../spec/docker/hhvm-apache_spec.rb | 17 --- .../serverspec/spec/docker/hhvm-nginx_spec.rb | 17 --- tests/serverspec/spec/docker/hhvm_spec.rb | 15 --- .../serverspec/spec/docker/liquibase_spec.rb | 12 -- .../serverspec/spec/docker/liquidsoap_spec.rb | 14 --- .../spec/docker/mail-sandbox_spec.rb | 15 --- .../serverspec/spec/docker/nginx-dev_spec.rb | 14 --- tests/serverspec/spec/docker/postfix_spec.rb | 14 --- .../spec/docker/samson-deployment_spec.rb | 17 --- tests/serverspec/spec/docker/sphinx_spec.rb | 13 --- .../serverspec/spec/docker/typo3-solr_spec.rb | 13 --- tests/serverspec/spec/docker/varnish_spec.rb | 13 --- .../spec/shared/ansible/toolchain.rb | 85 --------------- .../serverspec/spec/shared/certbot/layout.rb | 34 ------ .../serverspec/spec/shared/dovecot/layout.rb | 65 ----------- .../spec/shared/dovecot/listening.rb | 7 -- .../serverspec/spec/shared/dovecot/service.rb | 18 --- tests/serverspec/spec/shared/hhvm/layout.rb | 65 ----------- .../serverspec/spec/shared/hhvm/listening.rb | 17 --- tests/serverspec/spec/shared/hhvm/service.rb | 18 --- tests/serverspec/spec/shared/hhvm/version.rb | 13 --- .../spec/shared/liquibase/liquibase.rb | 5 - .../spec/shared/liquidsoap/listening.rb | 7 -- .../serverspec/spec/shared/postfix/layout.rb | 65 ----------- .../spec/shared/postfix/listening.rb | 7 -- .../serverspec/spec/shared/postfix/service.rb | 25 ----- .../shared/samson-deployment/deployment.rb | 11 -- .../spec/shared/samson-deployment/layout.rb | 100 ----------------- .../shared/samson-deployment/listening.rb | 14 --- tests/serverspec/spec/shared/sphinx/sphinx.rb | 21 ---- .../spec/shared/typo3-solr/layout.rb | 34 ------ .../spec/shared/typo3-solr/listening.rb | 7 -- .../spec/shared/typo3-solr/service.rb | 7 -- .../serverspec/spec/shared/typo3-solr/test.rb | 66 ----------- .../serverspec/spec/shared/varnish/layout.rb | 103 ------------------ .../spec/shared/varnish/listening.rb | 7 -- 52 files changed, 1166 deletions(-) delete mode 100644 tests/serverspec/spec/collection/ansible.rb delete mode 100644 tests/serverspec/spec/collection/certbot.rb delete mode 100644 tests/serverspec/spec/collection/dovecot.rb delete mode 100644 tests/serverspec/spec/collection/hhvm.rb delete mode 100644 tests/serverspec/spec/collection/liquibase.rb delete mode 100644 tests/serverspec/spec/collection/liquidsoap.rb delete mode 100644 tests/serverspec/spec/collection/php-fpm5.rb delete mode 100644 tests/serverspec/spec/collection/php5.rb delete mode 100644 tests/serverspec/spec/collection/postfix.rb delete mode 100644 tests/serverspec/spec/collection/samson-deployment.rb delete mode 100644 tests/serverspec/spec/collection/sphinx.rb delete mode 100644 tests/serverspec/spec/collection/typo3-solr.rb delete mode 100644 tests/serverspec/spec/collection/varnish.rb delete mode 100644 tests/serverspec/spec/docker/ansible_spec.rb delete mode 100644 tests/serverspec/spec/docker/certbot_spec.rb delete mode 100644 tests/serverspec/spec/docker/hhvm-apache_spec.rb delete mode 100644 tests/serverspec/spec/docker/hhvm-nginx_spec.rb delete mode 100644 tests/serverspec/spec/docker/hhvm_spec.rb delete mode 100644 tests/serverspec/spec/docker/liquibase_spec.rb delete mode 100644 tests/serverspec/spec/docker/liquidsoap_spec.rb delete mode 100644 tests/serverspec/spec/docker/mail-sandbox_spec.rb delete mode 100644 tests/serverspec/spec/docker/nginx-dev_spec.rb delete mode 100644 tests/serverspec/spec/docker/postfix_spec.rb delete mode 100644 tests/serverspec/spec/docker/samson-deployment_spec.rb delete mode 100644 tests/serverspec/spec/docker/sphinx_spec.rb delete mode 100644 tests/serverspec/spec/docker/typo3-solr_spec.rb delete mode 100644 tests/serverspec/spec/docker/varnish_spec.rb delete mode 100644 tests/serverspec/spec/shared/ansible/toolchain.rb delete mode 100644 tests/serverspec/spec/shared/certbot/layout.rb delete mode 100644 tests/serverspec/spec/shared/dovecot/layout.rb delete mode 100644 tests/serverspec/spec/shared/dovecot/listening.rb delete mode 100644 tests/serverspec/spec/shared/dovecot/service.rb delete mode 100644 tests/serverspec/spec/shared/hhvm/layout.rb delete mode 100644 tests/serverspec/spec/shared/hhvm/listening.rb delete mode 100644 tests/serverspec/spec/shared/hhvm/service.rb delete mode 100644 tests/serverspec/spec/shared/hhvm/version.rb delete mode 100644 tests/serverspec/spec/shared/liquibase/liquibase.rb delete mode 100644 tests/serverspec/spec/shared/liquidsoap/listening.rb delete mode 100644 tests/serverspec/spec/shared/postfix/layout.rb delete mode 100644 tests/serverspec/spec/shared/postfix/listening.rb delete mode 100644 tests/serverspec/spec/shared/postfix/service.rb delete mode 100644 tests/serverspec/spec/shared/samson-deployment/deployment.rb delete mode 100644 tests/serverspec/spec/shared/samson-deployment/layout.rb delete mode 100644 tests/serverspec/spec/shared/samson-deployment/listening.rb delete mode 100644 tests/serverspec/spec/shared/sphinx/sphinx.rb delete mode 100644 tests/serverspec/spec/shared/typo3-solr/layout.rb delete mode 100644 tests/serverspec/spec/shared/typo3-solr/listening.rb delete mode 100644 tests/serverspec/spec/shared/typo3-solr/service.rb delete mode 100644 tests/serverspec/spec/shared/typo3-solr/test.rb delete mode 100644 tests/serverspec/spec/shared/varnish/layout.rb delete mode 100644 tests/serverspec/spec/shared/varnish/listening.rb diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php index 563087d40..4e76370aa 100644 --- a/ci/src/JobBuilder.php +++ b/ci/src/JobBuilder.php @@ -80,9 +80,6 @@ private function serverSpec(array $node) 'echo "FROM ' . $node['id'] . '" >> ' . $testDockerfile, 'echo "COPY conf/ /" >> ' . $testDockerfile, ]; - if ($node['image'] === 'varnish') { - $script[] = 'echo "ENV VARNISH_BACKEND_HOST webdevops.io" >> ' . $testDockerfile; - } $script[] = 'bundle install'; $script[] = 'bash serverspec.sh ' . $specFile . ' ' . $node['id'] .' ' . $encodedJsonConfig . ' ' . $testDockerfile; return $script; diff --git a/tests/serverspec/spec/collection/ansible.rb b/tests/serverspec/spec/collection/ansible.rb deleted file mode 100644 index f170ecc69..000000000 --- a/tests/serverspec/spec/collection/ansible.rb +++ /dev/null @@ -1,4 +0,0 @@ -shared_examples 'collection::ansible' do - include_examples 'python::toolchain' - include_examples 'ansible::toolchain' -end diff --git a/tests/serverspec/spec/collection/certbot.rb b/tests/serverspec/spec/collection/certbot.rb deleted file mode 100644 index 79de26a2d..000000000 --- a/tests/serverspec/spec/collection/certbot.rb +++ /dev/null @@ -1,6 +0,0 @@ -shared_examples 'collection::certbot' do - include_examples 'python::toolchain' - - include_examples 'misc::letsencrypt' - include_examples 'certbot::layout' -end diff --git a/tests/serverspec/spec/collection/dovecot.rb b/tests/serverspec/spec/collection/dovecot.rb deleted file mode 100644 index 4d7c33bef..000000000 --- a/tests/serverspec/spec/collection/dovecot.rb +++ /dev/null @@ -1,9 +0,0 @@ -shared_examples 'collection::dovecot' do - include_examples 'dovecot::layout' - - # services - include_examples 'dovecot::listening::public' - - # test after services are up - include_examples 'dovecot::service::running' -end diff --git a/tests/serverspec/spec/collection/hhvm.rb b/tests/serverspec/spec/collection/hhvm.rb deleted file mode 100644 index c3902748d..000000000 --- a/tests/serverspec/spec/collection/hhvm.rb +++ /dev/null @@ -1,16 +0,0 @@ -shared_examples 'collection::hhvm' do - include_examples 'hhvm::layout' - include_examples 'hhvm::cli::version' - include_examples 'php::cli::test::sha1' - include_examples 'php::composer' - - # services - include_examples 'hhvm::listening::public' - - # test after services are up - include_examples 'hhvm::service::running' -end - -shared_examples 'collection::hhvm::webserver-test' do - include_examples 'php::fpm::test::sha1' -end diff --git a/tests/serverspec/spec/collection/liquibase.rb b/tests/serverspec/spec/collection/liquibase.rb deleted file mode 100644 index e6b9827c1..000000000 --- a/tests/serverspec/spec/collection/liquibase.rb +++ /dev/null @@ -1,4 +0,0 @@ -shared_examples 'collection::liquibase' do - include_examples 'liquibase::liquibase' -end - diff --git a/tests/serverspec/spec/collection/liquidsoap.rb b/tests/serverspec/spec/collection/liquidsoap.rb deleted file mode 100644 index 6be2c4ef2..000000000 --- a/tests/serverspec/spec/collection/liquidsoap.rb +++ /dev/null @@ -1,4 +0,0 @@ -shared_examples 'collection::liquidsoap' do - include_examples 'liquidsoap::listening::public' -end - diff --git a/tests/serverspec/spec/collection/php-fpm5.rb b/tests/serverspec/spec/collection/php-fpm5.rb deleted file mode 100644 index e34de5c9e..000000000 --- a/tests/serverspec/spec/collection/php-fpm5.rb +++ /dev/null @@ -1,44 +0,0 @@ -shared_examples 'collection::php-fpm5' do - include_examples 'php-fpm::layout' - include_examples 'php-fpm5::layout' -end - -shared_examples 'collection::php-fpm5::public' do - # services - include_examples 'php-fpm::listening::public' - - # test after services are up - include_examples 'php-fpm::service::running' -end - -shared_examples 'collection::php-fpm5::local-only' do - # services - include_examples 'php-fpm::listening::local-only' - - # test after services are up - include_examples 'php-fpm::service::running' -end - - -shared_examples 'collection::php-fpm5::webserver-test::development' do - include_examples 'php-fpm::modules' - include_examples 'php-fpm5::modules' - include_examples 'php-fpm::modules::development' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php::fpm::test::process_user_id' - include_examples 'php5::fpm::test::version' -end - -shared_examples 'collection::php-fpm5::webserver-test::production' do - include_examples 'php-fpm::modules' - include_examples 'php-fpm5::modules' - include_examples 'php-fpm::modules::production' - include_examples 'php::fpm::test::sha1' - include_examples 'php::fpm::test::php_ini_scanned_files' - include_examples 'php::fpm::test::php_sapi_name' - include_examples 'php::fpm::test::process_user_id' - include_examples 'php5::fpm::test::version' -end - diff --git a/tests/serverspec/spec/collection/php5.rb b/tests/serverspec/spec/collection/php5.rb deleted file mode 100644 index 691499d9d..000000000 --- a/tests/serverspec/spec/collection/php5.rb +++ /dev/null @@ -1,29 +0,0 @@ -shared_examples 'collection::php5' do - include_examples 'php::layout' - include_examples 'php::cli' - include_examples 'php5::cli::version' - include_examples 'php::modules' - include_examples 'php5::modules' - include_examples 'php::cli::configuration' - include_examples 'php::cli::test::sha1' - include_examples 'php::cli::test::php_ini_scanned_files' - include_examples 'php::cli::test::php_sapi_name' - include_examples 'php::composer' - include_examples 'php::pear' - - include_examples 'misc::graphicsmagick' - include_examples 'misc::imagemagick' - include_examples 'misc::ghostscript' -end - -shared_examples 'collection::php5::production' do - include_examples 'collection::php5' - include_examples 'php::modules::production' - include_examples 'php::cli::configuration::production' -end - -shared_examples 'collection::php5::development' do - include_examples 'collection::php5' - include_examples 'php::modules::development' - include_examples 'php::cli::configuration::development' -end diff --git a/tests/serverspec/spec/collection/postfix.rb b/tests/serverspec/spec/collection/postfix.rb deleted file mode 100644 index c81c8c013..000000000 --- a/tests/serverspec/spec/collection/postfix.rb +++ /dev/null @@ -1,9 +0,0 @@ -shared_examples 'collection::postfix' do - include_examples 'postfix::layout' - - # services - include_examples 'postfix::listening::public' - - # test after services are up - include_examples 'postfix::service::running' -end diff --git a/tests/serverspec/spec/collection/samson-deployment.rb b/tests/serverspec/spec/collection/samson-deployment.rb deleted file mode 100644 index a1c37434e..000000000 --- a/tests/serverspec/spec/collection/samson-deployment.rb +++ /dev/null @@ -1,16 +0,0 @@ -shared_examples 'collection::samson-deployment' do - include_examples 'python::toolchain' - include_examples 'ansible::toolchain::public' - - include_examples 'samson-deployment::layout' - include_examples 'samson-deployment::deployment' - - # services - include_examples 'samson-deployment::listening::public' -end - -shared_examples 'collection::samson-deployment::php' do - include_examples 'php::cli' - include_examples 'php7::cli::version' - include_examples 'php::composer' -end diff --git a/tests/serverspec/spec/collection/sphinx.rb b/tests/serverspec/spec/collection/sphinx.rb deleted file mode 100644 index cab5aedf9..000000000 --- a/tests/serverspec/spec/collection/sphinx.rb +++ /dev/null @@ -1,4 +0,0 @@ -shared_examples 'collection::sphinx' do - include_examples 'sphinx::sphinx' - include_examples 'misc::graphviz' -end diff --git a/tests/serverspec/spec/collection/typo3-solr.rb b/tests/serverspec/spec/collection/typo3-solr.rb deleted file mode 100644 index a2b06d929..000000000 --- a/tests/serverspec/spec/collection/typo3-solr.rb +++ /dev/null @@ -1,9 +0,0 @@ -shared_examples 'collection::typo3-solr' do - include_examples 'typo3-solr::layout' - - # currently there are images without "ps" support - #include_examples 'typo3-solr::service::running' - - include_examples 'typo3-solr::listening::public' - include_examples 'typo3-solr::test' -end diff --git a/tests/serverspec/spec/collection/varnish.rb b/tests/serverspec/spec/collection/varnish.rb deleted file mode 100644 index ba2389861..000000000 --- a/tests/serverspec/spec/collection/varnish.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'collection::varnish' do - include_examples 'varnish::layout' - - # services - include_examples 'varnish::listening::public' -end - diff --git a/tests/serverspec/spec/docker/ansible_spec.rb b/tests/serverspec/spec/docker/ansible_spec.rb deleted file mode 100644 index 6624cc1d7..000000000 --- a/tests/serverspec/spec/docker/ansible_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::ansible' - -end diff --git a/tests/serverspec/spec/docker/certbot_spec.rb b/tests/serverspec/spec/docker/certbot_spec.rb deleted file mode 100644 index e4c5b0180..000000000 --- a/tests/serverspec/spec/docker/certbot_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - # include_examples 'collection::base' - include_examples 'collection::certbot' - -end diff --git a/tests/serverspec/spec/docker/hhvm-apache_spec.rb b/tests/serverspec/spec/docker/hhvm-apache_spec.rb deleted file mode 100644 index 1a817e502..000000000 --- a/tests/serverspec/spec/docker/hhvm-apache_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::base-app' - include_examples 'collection::hhvm' - include_examples 'collection::apache' - include_examples 'collection::hhvm::webserver-test' - -end diff --git a/tests/serverspec/spec/docker/hhvm-nginx_spec.rb b/tests/serverspec/spec/docker/hhvm-nginx_spec.rb deleted file mode 100644 index 3d270c747..000000000 --- a/tests/serverspec/spec/docker/hhvm-nginx_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::base-app' - include_examples 'collection::hhvm' - include_examples 'collection::nginx' - include_examples 'collection::hhvm::webserver-test' - -end diff --git a/tests/serverspec/spec/docker/hhvm_spec.rb b/tests/serverspec/spec/docker/hhvm_spec.rb deleted file mode 100644 index 32b586f20..000000000 --- a/tests/serverspec/spec/docker/hhvm_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::base-app' - include_examples 'collection::hhvm' - -end diff --git a/tests/serverspec/spec/docker/liquibase_spec.rb b/tests/serverspec/spec/docker/liquibase_spec.rb deleted file mode 100644 index ff3605893..000000000 --- a/tests/serverspec/spec/docker/liquibase_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::liquibase' - -end diff --git a/tests/serverspec/spec/docker/liquidsoap_spec.rb b/tests/serverspec/spec/docker/liquidsoap_spec.rb deleted file mode 100644 index be66c975e..000000000 --- a/tests/serverspec/spec/docker/liquidsoap_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::liquidsoap' - -end diff --git a/tests/serverspec/spec/docker/mail-sandbox_spec.rb b/tests/serverspec/spec/docker/mail-sandbox_spec.rb deleted file mode 100644 index a6371519c..000000000 --- a/tests/serverspec/spec/docker/mail-sandbox_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::postfix' - include_examples 'collection::dovecot' - -end diff --git a/tests/serverspec/spec/docker/nginx-dev_spec.rb b/tests/serverspec/spec/docker/nginx-dev_spec.rb deleted file mode 100644 index e9ed14206..000000000 --- a/tests/serverspec/spec/docker/nginx-dev_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::nginx' - -end diff --git a/tests/serverspec/spec/docker/postfix_spec.rb b/tests/serverspec/spec/docker/postfix_spec.rb deleted file mode 100644 index e2cdfd21b..000000000 --- a/tests/serverspec/spec/docker/postfix_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::base' - include_examples 'collection::postfix' - -end diff --git a/tests/serverspec/spec/docker/samson-deployment_spec.rb b/tests/serverspec/spec/docker/samson-deployment_spec.rb deleted file mode 100644 index 9ec7cc44d..000000000 --- a/tests/serverspec/spec/docker/samson-deployment_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'bootstrap::layout' - include_examples 'bootstrap::distribution' - - include_examples 'collection::base-app' - include_examples 'collection::samson-deployment::php' - include_examples 'collection::samson-deployment' - -end diff --git a/tests/serverspec/spec/docker/sphinx_spec.rb b/tests/serverspec/spec/docker/sphinx_spec.rb deleted file mode 100644 index 175762f02..000000000 --- a/tests/serverspec/spec/docker/sphinx_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::sphinx' - -end diff --git a/tests/serverspec/spec/docker/typo3-solr_spec.rb b/tests/serverspec/spec/docker/typo3-solr_spec.rb deleted file mode 100644 index 728d8996c..000000000 --- a/tests/serverspec/spec/docker/typo3-solr_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap::upstream-image' - include_examples 'collection::typo3-solr' - -end diff --git a/tests/serverspec/spec/docker/varnish_spec.rb b/tests/serverspec/spec/docker/varnish_spec.rb deleted file mode 100644 index a502b279b..000000000 --- a/tests/serverspec/spec/docker/varnish_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'serverspec' -require 'docker' -require 'spec_init' - -describe "Dockerfile" do - before(:all) do - set :docker_image, ENV['DOCKERIMAGE_ID'] - end - - include_examples 'collection::bootstrap' - include_examples 'collection::varnish' - -end diff --git a/tests/serverspec/spec/shared/ansible/toolchain.rb b/tests/serverspec/spec/shared/ansible/toolchain.rb deleted file mode 100644 index c932c02e3..000000000 --- a/tests/serverspec/spec/shared/ansible/toolchain.rb +++ /dev/null @@ -1,85 +0,0 @@ -shared_examples 'ansible::toolchain' do - - ansibleList = [ - $testConfiguration[:ansiblePath] + "/ansible", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should_not be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should_not be_executable.by('others') } - end - end - - describe command('ansible --version') do - its(:stdout) { should match $packageVersions[:ansible] } - - its(:exit_status) { should eq 0 } - end - - describe command('ansible-playbook --version') do - its(:stdout) { should match $packageVersions[:ansiblePlaybook] } - - its(:exit_status) { should eq 0 } - end -end - -shared_examples 'ansible::toolchain::public' do - - ansibleList = [ - $testConfiguration[:ansiblePath] + "/ansible", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - describe command('ansible --version') do - its(:stdout) { should match $packageVersions[:ansible] } - - its(:exit_status) { should eq 0 } - end - - describe command('ansible-playbook --version') do - its(:stdout) { should match $packageVersions[:ansiblePlaybook] } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/certbot/layout.rb b/tests/serverspec/spec/shared/certbot/layout.rb deleted file mode 100644 index d4df77191..000000000 --- a/tests/serverspec/spec/shared/certbot/layout.rb +++ /dev/null @@ -1,34 +0,0 @@ -shared_examples 'certbot::layout' do - ######################### - ## Directories - ######################### - [ - "/var/www", - "/etc/letsencrypt", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - -end diff --git a/tests/serverspec/spec/shared/dovecot/layout.rb b/tests/serverspec/spec/shared/dovecot/layout.rb deleted file mode 100644 index afc90d163..000000000 --- a/tests/serverspec/spec/shared/dovecot/layout.rb +++ /dev/null @@ -1,65 +0,0 @@ -shared_examples 'dovecot::layout' do - ######################### - ## Directories - ######################### - [ - "/opt/docker/bin/service.d/dovecot.d" - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - ######################### - ## Files - ######################### - [ - "/opt/docker/bin/service.d/dovecot.sh", - "/opt/docker/bin/service.d/dovecot.d/10-init.sh", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - it { should be_executable } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end -end diff --git a/tests/serverspec/spec/shared/dovecot/listening.rb b/tests/serverspec/spec/shared/dovecot/listening.rb deleted file mode 100644 index 42d74b396..000000000 --- a/tests/serverspec/spec/shared/dovecot/listening.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'dovecot::listening::public' do - describe port(143) do - it "dovecot should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end -end diff --git a/tests/serverspec/spec/shared/dovecot/service.rb b/tests/serverspec/spec/shared/dovecot/service.rb deleted file mode 100644 index bf245ecbf..000000000 --- a/tests/serverspec/spec/shared/dovecot/service.rb +++ /dev/null @@ -1,18 +0,0 @@ -shared_examples 'dovecot::service::running' do - describe "service dovecot check" do - it "should have running dovecot daemon", :retry => 20, :retry_wait => 3 do - cmd = command("service dovecot check") - expect(cmd.stdout).to match('ok') - expect(cmd.exit_status).to eq 0 - end - end - - describe command('service dovecot pid | tr -d \'\n\'') do - # must not pid 0 - its(:stdout) { should_not match %r!^0$! } - # numeric match - its(:stdout) { should match %r!^[0-9]+$! } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/hhvm/layout.rb b/tests/serverspec/spec/shared/hhvm/layout.rb deleted file mode 100644 index a4c484487..000000000 --- a/tests/serverspec/spec/shared/hhvm/layout.rb +++ /dev/null @@ -1,65 +0,0 @@ -shared_examples 'hhvm::layout' do - ######################### - ## Directories - ######################### - [ - "/opt/docker/bin/service.d/hhvm.d" - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - ######################### - ## Files - ######################### - [ - "/opt/docker/bin/service.d/hhvm.sh", - "/opt/docker/bin/service.d/hhvm.d/10-init.sh", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - it { should be_executable } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end -end diff --git a/tests/serverspec/spec/shared/hhvm/listening.rb b/tests/serverspec/spec/shared/hhvm/listening.rb deleted file mode 100644 index fbfcc1f64..000000000 --- a/tests/serverspec/spec/shared/hhvm/listening.rb +++ /dev/null @@ -1,17 +0,0 @@ -shared_examples 'hhvm::listening::public' do - describe port(9000) do - it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.on('::').or(be_listening.on('0.0.0.0')) - end - end -end - -shared_examples 'hhvm::listening::local-only' do - describe port(9000) do - it "hhvm should be listening local", :retry => 20, :retry_wait => 3 do - should_not be_listening.on('::') - should_not be_listening.on('0.0.0.0') - should be_listening.on('::1').or(be_listening.on('127.0.0.1')) - end - end -end diff --git a/tests/serverspec/spec/shared/hhvm/service.rb b/tests/serverspec/spec/shared/hhvm/service.rb deleted file mode 100644 index 89026b789..000000000 --- a/tests/serverspec/spec/shared/hhvm/service.rb +++ /dev/null @@ -1,18 +0,0 @@ -shared_examples 'hhvm::service::running' do - describe "service hhvm check" do - it "should have running hhvm daemon", :retry => 20, :retry_wait => 3 do - cmd = command("service hhvm check") - expect(cmd.stdout).to match('ok') - expect(cmd.exit_status).to eq 0 - end - end - - describe command('service hhvm pid | tr -d \'\n\'') do - # must not pid 0 - its(:stdout) { should_not match %r!^0$! } - # numeric match - its(:stdout) { should match %r!^[0-9]+$! } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/hhvm/version.rb b/tests/serverspec/spec/shared/hhvm/version.rb deleted file mode 100644 index d71a87db7..000000000 --- a/tests/serverspec/spec/shared/hhvm/version.rb +++ /dev/null @@ -1,13 +0,0 @@ -shared_examples 'hhvm::cli::version' do - describe command('hhvm --version') do - its(:stdout) { should match %r!HipHop VM [0-9]+.[0-9]+.[0-9]+ \(rel\)! } - - its(:exit_status) { should eq 0 } - end - - describe command('php --version') do - its(:stdout) { should match %r!HipHop VM [0-9]+.[0-9]+.[0-9]+ \(rel\)! } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/liquibase/liquibase.rb b/tests/serverspec/spec/shared/liquibase/liquibase.rb deleted file mode 100644 index 4190dbed9..000000000 --- a/tests/serverspec/spec/shared/liquibase/liquibase.rb +++ /dev/null @@ -1,5 +0,0 @@ -shared_examples 'liquibase::liquibase' do - describe command('liquibase --version') do - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/liquidsoap/listening.rb b/tests/serverspec/spec/shared/liquidsoap/listening.rb deleted file mode 100644 index 035b8ab1c..000000000 --- a/tests/serverspec/spec/shared/liquidsoap/listening.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'liquidsoap::listening::public' do - describe port(1234) do - it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end -end diff --git a/tests/serverspec/spec/shared/postfix/layout.rb b/tests/serverspec/spec/shared/postfix/layout.rb deleted file mode 100644 index 077c14e5d..000000000 --- a/tests/serverspec/spec/shared/postfix/layout.rb +++ /dev/null @@ -1,65 +0,0 @@ -shared_examples 'postfix::layout' do - ######################### - ## Directories - ######################### - [ - "/opt/docker/bin/service.d/postfix.d" - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - ######################### - ## Files - ######################### - [ - "/opt/docker/bin/service.d/postfix.sh", - "/opt/docker/bin/service.d/postfix.d/10-init.sh", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - it { should be_executable } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end -end diff --git a/tests/serverspec/spec/shared/postfix/listening.rb b/tests/serverspec/spec/shared/postfix/listening.rb deleted file mode 100644 index 2bfb1881d..000000000 --- a/tests/serverspec/spec/shared/postfix/listening.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'postfix::listening::public' do - describe port(25) do - it "postfix should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end -end diff --git a/tests/serverspec/spec/shared/postfix/service.rb b/tests/serverspec/spec/shared/postfix/service.rb deleted file mode 100644 index 1e85d99b9..000000000 --- a/tests/serverspec/spec/shared/postfix/service.rb +++ /dev/null @@ -1,25 +0,0 @@ -shared_examples 'postfix::service::running' do - describe "service postfix check" do - it "should have running postfix daemon", :retry => 20, :retry_wait => 3 do - cmd = command("service postfix check") - expect(cmd.stdout).to match('ok') - expect(cmd.exit_status).to eq 0 - end - end - - describe command('service postfix pid | tr -d \'\n\'') do - # must not pid 0 - its(:stdout) { should_not match %r!^0$! } - # numeric match - its(:stdout) { should match %r!^[0-9]+$! } - - its(:exit_status) { should eq 0 } - end - - describe command('mailq') do - its(:stdout) { should_not contain('warning') } - its(:stderr) { should_not contain('warning') } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/samson-deployment/deployment.rb b/tests/serverspec/spec/shared/samson-deployment/deployment.rb deleted file mode 100644 index e8b1b43f5..000000000 --- a/tests/serverspec/spec/shared/samson-deployment/deployment.rb +++ /dev/null @@ -1,11 +0,0 @@ -shared_examples 'samson-deployment::deployment' do - - describe command('/usr/local/bin/dep') do - its(:exit_status) { should eq 0 } - end - - describe command('/usr/local/bundle/bin/cap -v') do - its(:exit_status) { should eq 0 } - end - -end diff --git a/tests/serverspec/spec/shared/samson-deployment/layout.rb b/tests/serverspec/spec/shared/samson-deployment/layout.rb deleted file mode 100644 index c5f458e20..000000000 --- a/tests/serverspec/spec/shared/samson-deployment/layout.rb +++ /dev/null @@ -1,100 +0,0 @@ -shared_examples 'samson-deployment::layout' do - ######################### - ## Directories - ######################### - [ - "/app/app", - "/app/tmp", - "/app/vendor", - "/app/public/assets", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by('application') } - it { should be_grouped_into('application') } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - ######################### - ## Files - ######################### - [ - "/app/public/assets/502.html", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by('application') } - it { should be_grouped_into('application') } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should_not be_executable.by('owner') } - it { should_not be_executable.by('group') } - it { should_not be_executable.by('others') } - end - end - - ######################### - ## Deployer - ######################### - - [ - "/usr/local/bin/ansible", - "/usr/local/bin/dep", - "/usr/local/bundle/bin/cap", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by('root') } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - -end diff --git a/tests/serverspec/spec/shared/samson-deployment/listening.rb b/tests/serverspec/spec/shared/samson-deployment/listening.rb deleted file mode 100644 index 45cd83c5c..000000000 --- a/tests/serverspec/spec/shared/samson-deployment/listening.rb +++ /dev/null @@ -1,14 +0,0 @@ -shared_examples 'samson-deployment::listening::public' do - describe port(80) do - it "samson (nginx reverse proxy) should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end - -# will not start because github api keys are needed -# describe port(9000) do -# it "samson should be listening", :retry => 20, :retry_wait => 3 do -# should be_listening -# end -# end -end diff --git a/tests/serverspec/spec/shared/sphinx/sphinx.rb b/tests/serverspec/spec/shared/sphinx/sphinx.rb deleted file mode 100644 index e95ee6043..000000000 --- a/tests/serverspec/spec/shared/sphinx/sphinx.rb +++ /dev/null @@ -1,21 +0,0 @@ -shared_examples 'sphinx::sphinx' do - describe command('sphinx-build --version') do - its(:exit_status) { should eq 0 } - end - - describe command('sphinx-apidoc --version') do - its(:exit_status) { should eq 0 } - end - - describe command('sphinx-quickstart --version') do - its(:exit_status) { should eq 0 } - end - - describe command('sphinx-autobuild -h') do - its(:exit_status) { should eq 0 } - end - - describe command('sphinx-autogen -h') do - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/typo3-solr/layout.rb b/tests/serverspec/spec/shared/typo3-solr/layout.rb deleted file mode 100644 index 62711c59a..000000000 --- a/tests/serverspec/spec/shared/typo3-solr/layout.rb +++ /dev/null @@ -1,34 +0,0 @@ -shared_examples 'typo3-solr::layout' do - ######################### - ## Directories - ######################### - [ - "/opt/solr/server/solr", - "/opt/solr/server/solr/data", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'solr' } - it { should be_grouped_into 'solr' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - -end diff --git a/tests/serverspec/spec/shared/typo3-solr/listening.rb b/tests/serverspec/spec/shared/typo3-solr/listening.rb deleted file mode 100644 index 58fa6dee3..000000000 --- a/tests/serverspec/spec/shared/typo3-solr/listening.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'typo3-solr::listening::public' do - describe port(8983) do - it "solr should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end -end diff --git a/tests/serverspec/spec/shared/typo3-solr/service.rb b/tests/serverspec/spec/shared/typo3-solr/service.rb deleted file mode 100644 index 80f7d55bf..000000000 --- a/tests/serverspec/spec/shared/typo3-solr/service.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'typo3-solr::service::running' do - describe "service solr check" do - it "should have running solr daemon", :retry => 20, :retry_wait => 3 do - check_if_service_is_running_stable("java") - end - end -end diff --git a/tests/serverspec/spec/shared/typo3-solr/test.rb b/tests/serverspec/spec/shared/typo3-solr/test.rb deleted file mode 100644 index a4a37ebd4..000000000 --- a/tests/serverspec/spec/shared/typo3-solr/test.rb +++ /dev/null @@ -1,66 +0,0 @@ -shared_examples 'typo3-solr::test' do - describe 'solr-system-status' do - it 'solr version should be correct', :retry => 20, :retry_wait => 3 do - content = get_url('http://localhost:8983/solr/admin/info/system?wt=json') - content = JSON.parse(content) - - if content.key?('solr_home') - expect(content['solr_home']).to eql('/opt/solr/server/solr') - end - - expect(content['lucene']['solr-spec-version']).to eql(ENV['SOLR_VERSION']) - end - end - - describe 'solr-core-status' do - it 'solr version should be correct', :retry => 20, :retry_wait => 3 do - content = get_url('http://localhost:8983/solr/admin/cores?indexInfo=false&wt=json') - content = JSON.parse(content) - - [ - "core_ar", - "core_bg", - "core_ca", - "core_cs", - "core_da", - "core_de", - "core_el", - "core_en", - "core_es", - "core_eu", - "core_fa", - "core_fi", - "core_fr", - "core_gl", - "core_hi", - "core_hu", - "core_hy", - "core_id", - # "core_ie", - "core_it", - "core_ja", - "core_km", - "core_ko", - "core_lo", - # "core_lv", - "core_my", - "core_nl", - "core_no", - "core_pl", - "core_pt", - "core_ptbr", - "core_ro", - # "core_rs", - "core_ru", - "core_sv", - "core_th", - "core_tr", - "core_uk", - "core_zh", - ].each do |solr_core| - expect(content['status'][solr_core]['name']).to eql(solr_core) - end - end - end -end - diff --git a/tests/serverspec/spec/shared/varnish/layout.rb b/tests/serverspec/spec/shared/varnish/layout.rb deleted file mode 100644 index 060c1bb64..000000000 --- a/tests/serverspec/spec/shared/varnish/layout.rb +++ /dev/null @@ -1,103 +0,0 @@ -shared_examples 'varnish::layout' do - ######################### - ## Directories - ######################### - [ - "/opt/docker/etc/varnish", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_directory } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - - ######################### - ## Files - ######################### - [ - "/opt/docker/etc/varnish/varnish.vcl" - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should_not be_executable.by('owner') } - it { should_not be_executable.by('group') } - it { should_not be_executable.by('others') } - end - end - - ######################### - ## Scripts - ######################### - [ - "/opt/docker/bin/entrypoint.d/varnishd.sh" - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - # it { should_not be_writable.by('group') } - # it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should be_executable.by('others') } - end - end - -end diff --git a/tests/serverspec/spec/shared/varnish/listening.rb b/tests/serverspec/spec/shared/varnish/listening.rb deleted file mode 100644 index 87de3197e..000000000 --- a/tests/serverspec/spec/shared/varnish/listening.rb +++ /dev/null @@ -1,7 +0,0 @@ -shared_examples 'varnish::listening::public' do - describe port(80) do - it "varnish should be listening", :retry => 20, :retry_wait => 3 do - should be_listening - end - end -end From b1a6c605c38ba42a95062d8991d843a8328f02c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 19 Dec 2022 18:59:48 +0100 Subject: [PATCH 11/63] fix: deactivate SSH --- .gitlab-ci.yml | 365 +++++++++++++++++++++++-------------------------- ci/BLACKLIST | 3 +- 2 files changed, 173 insertions(+), 195 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a30d1317..b84e5dae3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,10 +50,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_63985166074c46.77379969' - - 'echo "COPY conf/ /" >> Dockerfile_63985166074c46.77379969' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_63a0a680aec4f2.12028252' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aec4f2.12028252' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzRjNDYuNzczNzk5NjkifQ== Dockerfile_63985166074c46.77379969' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWM0ZjIuMTIwMjgyNTIifQ== Dockerfile_63a0a680aec4f2.12028252' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -77,10 +77,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_63985166074e52.09117090' - - 'echo "COPY conf/ /" >> Dockerfile_63985166074e52.09117090' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_63a0a680aecb48.24914626' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aecb48.24914626' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc0ZTUyLjA5MTE3MDkwIn0= Dockerfile_63985166074e52.09117090' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVjYjQ4LjI0OTE0NjI2In0= Dockerfile_63a0a680aecb48.24914626' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -104,10 +104,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_63985166074ff4.54511951' - - 'echo "COPY conf/ /" >> Dockerfile_63985166074ff4.54511951' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_63a0a680aed031.81902440' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aed031.81902440' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NGZmNC41NDUxMTk1MSJ9 Dockerfile_63985166074ff4.54511951' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZDAzMS44MTkwMjQ0MCJ9 Dockerfile_63a0a680aed031.81902440' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -137,29 +137,6 @@ stages: - aws needs: - 'webdevops/base-app:ubuntu-22.04' -'webdevops/ssh:latest': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' - script: - - 'cd docker/ssh/latest' - - 'docker build --no-cache -t webdevops/ssh:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/ssh:latest" >> Dockerfile_63985166075216.31550695' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075216.31550695' - - 'bundle install' - - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjExIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzUyMTYuMzE1NTA2OTUifQ== Dockerfile_63985166075216.31550695' - - 'docker push webdevops/ssh:latest' - - 'docker tag webdevops/ssh:latest $CI_REGISTRY_IMAGE/ssh:latest' - - 'docker push $CI_REGISTRY_IMAGE/ssh:latest' - tags: - - aws - needs: - - 'webdevops/base-app:ubuntu-22.04' 'webdevops/vsftp:latest': stage: level4 before_script: @@ -172,10 +149,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63985166075351.87215397' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075351.87215397' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63a0a680aedd98.99659479' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aedd98.99659479' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NTM1MS44NzIxNTM5NyJ9 Dockerfile_63985166075351.87215397' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZGQ5OC45OTY1OTQ3OSJ9 Dockerfile_63a0a680aedd98.99659479' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -195,10 +172,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_639851660754a9.05182836' - - 'echo "COPY conf/ /" >> Dockerfile_639851660754a9.05182836' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_63a0a680aee1e5.53977971' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aee1e5.53977971' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1NGE5LjA1MTgyODM2In0= Dockerfile_639851660754a9.05182836' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVlMWU1LjUzOTc3OTcxIn0= Dockerfile_63a0a680aee1e5.53977971' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -220,10 +197,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_639851660755f2.94419725' - - 'echo "COPY conf/ /" >> Dockerfile_639851660755f2.94419725' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_63a0a680aee655.71582294' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aee655.71582294' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NTVmMi45NDQxOTcyNSJ9 Dockerfile_639851660755f2.94419725' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZTY1NS43MTU4MjI5NCJ9 Dockerfile_63a0a680aee655.71582294' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -245,10 +222,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63985166075761.23739089' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075761.23739089' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63a0a680aeeaa5.87446012' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aeeaa5.87446012' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzU3NjEuMjM3MzkwODkifQ== Dockerfile_63985166075761.23739089' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWVhYTUuODc0NDYwMTIifQ== Dockerfile_63a0a680aeeaa5.87446012' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -270,10 +247,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_639851660758c5.44335061' - - 'echo "COPY conf/ /" >> Dockerfile_639851660758c5.44335061' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_63a0a680aeef11.41945885' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aeef11.41945885' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzU4YzUuNDQzMzUwNjEifQ== Dockerfile_639851660758c5.44335061' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWVmMTEuNDE5NDU4ODUifQ== Dockerfile_63a0a680aeef11.41945885' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -293,10 +270,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_639851660759d3.30259943' - - 'echo "COPY conf/ /" >> Dockerfile_639851660759d3.30259943' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_63a0a680aef379.68189984' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aef379.68189984' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1OWQzLjMwMjU5OTQzIn0= Dockerfile_639851660759d3.30259943' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVmMzc5LjY4MTg5OTg0In0= Dockerfile_63a0a680aef379.68189984' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -316,10 +293,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63985166075ae1.89864521' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075ae1.89864521' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63a0a680aef786.81226694' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aef786.81226694' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1YWUxLjg5ODY0NTIxIn0= Dockerfile_63985166075ae1.89864521' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVmNzg2LjgxMjI2Njk0In0= Dockerfile_63a0a680aef786.81226694' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -343,10 +320,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63985166075c51.74213392' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075c51.74213392' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63a0a680aefc48.06046439' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aefc48.06046439' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NWM1MS43NDIxMzM5MiJ9 Dockerfile_63985166075c51.74213392' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZmM0OC4wNjA0NjQzOSJ9 Dockerfile_63a0a680aefc48.06046439' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -366,10 +343,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63985166075dc9.62803358' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075dc9.62803358' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63a0a680af0198.61797607' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0198.61797607' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzVkYzkuNjI4MDMzNTgifQ== Dockerfile_63985166075dc9.62803358' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjAxOTguNjE3OTc2MDcifQ== Dockerfile_63a0a680af0198.61797607' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -389,10 +366,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63985166075f55.41777486' - - 'echo "COPY conf/ /" >> Dockerfile_63985166075f55.41777486' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63a0a680af05b4.16893204' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af05b4.16893204' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc1ZjU1LjQxNzc3NDg2In0= Dockerfile_63985166075f55.41777486' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWYwNWI0LjE2ODkzMjA0In0= Dockerfile_63a0a680af05b4.16893204' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -414,10 +391,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63985166076112.30117508' - - 'echo "COPY conf/ /" >> Dockerfile_63985166076112.30117508' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63a0a680af0a74.03572072' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0a74.03572072' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NjExMi4zMDExNzUwOCJ9 Dockerfile_63985166076112.30117508' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMGE3NC4wMzU3MjA3MiJ9 Dockerfile_63a0a680af0a74.03572072' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -437,10 +414,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63985166076243.37398296' - - 'echo "COPY conf/ /" >> Dockerfile_63985166076243.37398296' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63a0a680af0e97.36035783' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0e97.36035783' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NjI0My4zNzM5ODI5NiJ9 Dockerfile_63985166076243.37398296' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMGU5Ny4zNjAzNTc4MyJ9 Dockerfile_63a0a680af0e97.36035783' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -462,10 +439,10 @@ stages: - 'cd docker/php-official/7.4-alpine' - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63985166076d05.32014587' - - 'echo "COPY conf/ /" >> Dockerfile_63985166076d05.32014587' + - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63a0a680af2c81.56562395' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af2c81.56562395' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NmQwNS4zMjAxNDU4NyJ9 Dockerfile_63985166076d05.32014587' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMmM4MS41NjU2MjM5NSJ9 Dockerfile_63a0a680af2c81.56562395' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - 'docker push webdevops/php:7.4-alpine' @@ -489,10 +466,10 @@ stages: - 'cd docker/php-apache/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63985166076e87.56313875' - - 'echo "COPY conf/ /" >> Dockerfile_63985166076e87.56313875' + - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63a0a680af30e3.44124635' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af30e3.44124635' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzZlODcuNTYzMTM4NzUifQ== Dockerfile_63985166076e87.56313875' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjMwZTMuNDQxMjQ2MzUifQ== Dockerfile_63a0a680af30e3.44124635' - 'docker push webdevops/php-apache:7.4-alpine' - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' @@ -512,10 +489,10 @@ stages: - 'cd docker/php-apache-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63985166077003.15026998' - - 'echo "COPY conf/ /" >> Dockerfile_63985166077003.15026998' + - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63a0a680af34d5.47006296' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af34d5.47006296' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc3MDAzLjE1MDI2OTk4In0= Dockerfile_63985166077003.15026998' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWYzNGQ1LjQ3MDA2Mjk2In0= Dockerfile_63a0a680af34d5.47006296' - 'docker push webdevops/php-apache-dev:7.4-alpine' - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' @@ -535,10 +512,10 @@ stages: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63985166077159.61926758' - - 'echo "COPY conf/ /" >> Dockerfile_63985166077159.61926758' + - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63a0a680af38d0.76710289' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af38d0.76710289' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3NzE1OS42MTkyNjc1OCJ9 Dockerfile_63985166077159.61926758' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMzhkMC43NjcxMDI4OSJ9 Dockerfile_63a0a680af38d0.76710289' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4-alpine' @@ -560,10 +537,10 @@ stages: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_639851660772f1.90842783' - - 'echo "COPY conf/ /" >> Dockerfile_639851660772f1.90842783' + - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_63a0a680af3d58.70391939' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af3d58.70391939' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzcyZjEuOTA4NDI3ODMifQ== Dockerfile_639851660772f1.90842783' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjNkNTguNzAzOTE5MzkifQ== Dockerfile_63a0a680af3d58.70391939' - 'docker push webdevops/php-nginx-dev:7.4-alpine' - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' @@ -583,10 +560,10 @@ stages: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63985166077448.91519419' - - 'echo "COPY conf/ /" >> Dockerfile_63985166077448.91519419' + - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63a0a680af4137.64723119' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af4137.64723119' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzc0NDguOTE1MTk0MTkifQ== Dockerfile_63985166077448.91519419' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjQxMzcuNjQ3MjMxMTkifQ== Dockerfile_63a0a680af4137.64723119' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4-alpine' @@ -608,10 +585,10 @@ stages: - 'cd docker/php-official/7.4' - 'docker build --no-cache -t webdevops/php:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63985166078708.94296664' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078708.94296664' + - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63a0a680af7893.34652045' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af7893.34652045' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc4NzA4Ljk0Mjk2NjY0In0= Dockerfile_63985166078708.94296664' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY3ODkzLjM0NjUyMDQ1In0= Dockerfile_63a0a680af7893.34652045' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - 'docker push webdevops/php:7.4' @@ -635,10 +612,10 @@ stages: - 'cd docker/php-apache/7.4' - 'docker build --no-cache -t webdevops/php-apache:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63985166078886.67016479' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078886.67016479' + - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63a0a680af7cf7.00346023' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af7cf7.00346023' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ODg4Ni42NzAxNjQ3OSJ9 Dockerfile_63985166078886.67016479' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmN2NmNy4wMDM0NjAyMyJ9 Dockerfile_63a0a680af7cf7.00346023' - 'docker push webdevops/php-apache:7.4' - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' @@ -658,10 +635,10 @@ stages: - 'cd docker/php-apache-dev/7.4' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_639851660789d1.20546637' - - 'echo "COPY conf/ /" >> Dockerfile_639851660789d1.20546637' + - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_63a0a680af80e5.44626955' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af80e5.44626955' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzg5ZDEuMjA1NDY2MzcifQ== Dockerfile_639851660789d1.20546637' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjgwZTUuNDQ2MjY5NTUifQ== Dockerfile_63a0a680af80e5.44626955' - 'docker push webdevops/php-apache-dev:7.4' - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' @@ -681,10 +658,10 @@ stages: - 'cd docker/php-nginx/7.4' - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63985166078ae2.48579456' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078ae2.48579456' + - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63a0a680af8502.17422102' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8502.17422102' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc4YWUyLjQ4NTc5NDU2In0= Dockerfile_63985166078ae2.48579456' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY4NTAyLjE3NDIyMTAyIn0= Dockerfile_63a0a680af8502.17422102' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4' @@ -706,10 +683,10 @@ stages: - 'cd docker/php-nginx-dev/7.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63985166078c32.68176340' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078c32.68176340' + - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63a0a680af8995.11217891' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8995.11217891' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGMzMi42ODE3NjM0MCJ9 Dockerfile_63985166078c32.68176340' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmODk5NS4xMTIxNzg5MSJ9 Dockerfile_63a0a680af8995.11217891' - 'docker push webdevops/php-nginx-dev:7.4' - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' @@ -729,10 +706,10 @@ stages: - 'cd docker/php-dev/7.4' - 'docker build --no-cache -t webdevops/php-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63985166078e00.53330376' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078e00.53330376' + - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63a0a680af8f30.54137318' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8f30.54137318' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGUwMC41MzMzMDM3NiJ9 Dockerfile_63985166078e00.53330376' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmOGYzMC41NDEzNzMxOCJ9 Dockerfile_63a0a680af8f30.54137318' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4' @@ -754,10 +731,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63985166078fb8.76161242' - - 'echo "COPY conf/ /" >> Dockerfile_63985166078fb8.76161242' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63a0a680af9384.72177834' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af9384.72177834' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OGZiOC43NjE2MTI0MiJ9 Dockerfile_63985166078fb8.76161242' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmOTM4NC43MjE3NzgzNCJ9 Dockerfile_63a0a680af9384.72177834' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -781,10 +758,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_639851660790e1.62580202' - - 'echo "COPY conf/ /" >> Dockerfile_639851660790e1.62580202' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_63a0a680af97a9.33200366' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af97a9.33200366' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzkwZTEuNjI1ODAyMDIifQ== Dockerfile_639851660790e1.62580202' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjk3YTkuMzMyMDAzNjYifQ== Dockerfile_63a0a680af97a9.33200366' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -804,10 +781,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63985166079227.12932536' - - 'echo "COPY conf/ /" >> Dockerfile_63985166079227.12932536' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63a0a680af9c50.58605272' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af9c50.58605272' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDc5MjI3LjEyOTMyNTM2In0= Dockerfile_63985166079227.12932536' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY5YzUwLjU4NjA1MjcyIn0= Dockerfile_63a0a680af9c50.58605272' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -827,10 +804,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63985166079379.97344804' - - 'echo "COPY conf/ /" >> Dockerfile_63985166079379.97344804' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63a0a680afa068.84341269' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa068.84341269' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3OTM3OS45NzM0NDgwNCJ9 Dockerfile_63985166079379.97344804' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmYTA2OC44NDM0MTI2OSJ9 Dockerfile_63a0a680afa068.84341269' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -852,10 +829,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63985166079499.10767070' - - 'echo "COPY conf/ /" >> Dockerfile_63985166079499.10767070' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63a0a680afa4f1.40300894' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa4f1.40300894' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzk0OTkuMTA3NjcwNzAifQ== Dockerfile_63985166079499.10767070' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZmE0ZjEuNDAzMDA4OTQifQ== Dockerfile_63a0a680afa4f1.40300894' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -875,10 +852,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63985166079597.87801228' - - 'echo "COPY conf/ /" >> Dockerfile_63985166079597.87801228' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63a0a680afa8d4.08421132' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa8d4.08421132' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwNzk1OTcuODc4MDEyMjgifQ== Dockerfile_63985166079597.87801228' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZmE4ZDQuMDg0MjExMzIifQ== Dockerfile_63a0a680afa8d4.08421132' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -900,10 +877,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_6398516607b0a2.87505339' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b0a2.87505339' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_63a0a680affbc5.18976598' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680affbc5.18976598' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YjBhMi44NzUwNTMzOSJ9 Dockerfile_6398516607b0a2.87505339' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmZmJjNS4xODk3NjU5OCJ9 Dockerfile_63a0a680affbc5.18976598' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -927,10 +904,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_6398516607b242.64321131' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b242.64321131' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_63a0a680b000d8.20454323' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b000d8.20454323' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2IyNDIuNjQzMjExMzEifQ== Dockerfile_6398516607b242.64321131' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDAwZDguMjA0NTQzMjMifQ== Dockerfile_63a0a680b000d8.20454323' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -950,10 +927,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_6398516607b3a7.44543896' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b3a7.44543896' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_63a0a680b004e0.81849339' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b004e0.81849339' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiM2E3LjQ0NTQzODk2In0= Dockerfile_6398516607b3a7.44543896' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAwNGUwLjgxODQ5MzM5In0= Dockerfile_63a0a680b004e0.81849339' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -973,10 +950,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_6398516607b4f0.97492715' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b4f0.97492715' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_63a0a680b008b8.08732537' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b008b8.08732537' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YjRmMC45NzQ5MjcxNSJ9 Dockerfile_6398516607b4f0.97492715' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMDhiOC4wODczMjUzNyJ9 Dockerfile_63a0a680b008b8.08732537' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -998,10 +975,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_6398516607b640.02094991' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b640.02094991' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_63a0a680b00dc9.70917019' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b00dc9.70917019' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2I2NDAuMDIwOTQ5OTEifQ== Dockerfile_6398516607b640.02094991' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDBkYzkuNzA5MTcwMTkifQ== Dockerfile_63a0a680b00dc9.70917019' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -1021,10 +998,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_6398516607b7e9.03137189' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b7e9.03137189' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_63a0a680b011b3.31908800' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b011b3.31908800' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2I3ZTkuMDMxMzcxODkifQ== Dockerfile_6398516607b7e9.03137189' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDExYjMuMzE5MDg4MDAifQ== Dockerfile_63a0a680b011b3.31908800' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -1046,10 +1023,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_6398516607b969.97628102' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607b969.97628102' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_63a0a680b01626.11823495' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01626.11823495' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiOTY5Ljk3NjI4MTAyIn0= Dockerfile_6398516607b969.97628102' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAxNjI2LjExODIzNDk1In0= Dockerfile_63a0a680b01626.11823495' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -1073,10 +1050,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_6398516607ba88.66388314' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607ba88.66388314' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_63a0a680b01a99.22853407' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01a99.22853407' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmE4OC42NjM4ODMxNCJ9 Dockerfile_6398516607ba88.66388314' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMWE5OS4yMjg1MzQwNyJ9 Dockerfile_63a0a680b01a99.22853407' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -1096,10 +1073,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_6398516607bbf7.78917613' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607bbf7.78917613' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_63a0a680b01f65.87790388' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01f65.87790388' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2JiZjcuNzg5MTc2MTMifQ== Dockerfile_6398516607bbf7.78917613' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDFmNjUuODc3OTAzODgifQ== Dockerfile_63a0a680b01f65.87790388' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -1119,10 +1096,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_6398516607bd42.20207314' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607bd42.20207314' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_63a0a680b02368.32057091' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02368.32057091' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdiZDQyLjIwMjA3MzE0In0= Dockerfile_6398516607bd42.20207314' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAyMzY4LjMyMDU3MDkxIn0= Dockerfile_63a0a680b02368.32057091' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -1144,10 +1121,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_6398516607bec0.77440931' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607bec0.77440931' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_63a0a680b02816.56160307' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02816.56160307' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmVjMC43NzQ0MDkzMSJ9 Dockerfile_6398516607bec0.77440931' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMjgxNi41NjE2MDMwNyJ9 Dockerfile_63a0a680b02816.56160307' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -1167,10 +1144,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_6398516607bff9.47792539' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607bff9.47792539' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_63a0a680b02c37.21270440' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02c37.21270440' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3YmZmOS40Nzc5MjUzOSJ9 Dockerfile_6398516607bff9.47792539' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMmMzNy4yMTI3MDQ0MCJ9 Dockerfile_63a0a680b02c37.21270440' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -1192,10 +1169,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_6398516607ca24.57156846' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607ca24.57156846' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_63a0a680b04d73.48817070' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b04d73.48817070' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3Y2EyNC41NzE1Njg0NiJ9 Dockerfile_6398516607ca24.57156846' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwNGQ3My40ODgxNzA3MCJ9 Dockerfile_63a0a680b04d73.48817070' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1219,10 +1196,10 @@ stages: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_6398516607cb38.48174882' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607cb38.48174882' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_63a0a680b05273.41383017' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b05273.41383017' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2NiMzguNDgxNzQ4ODIifQ== Dockerfile_6398516607cb38.48174882' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDUyNzMuNDEzODMwMTcifQ== Dockerfile_63a0a680b05273.41383017' - 'docker push webdevops/php-apache:8.0-alpine' - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' @@ -1242,10 +1219,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_6398516607cc81.30619268' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607cc81.30619268' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_63a0a680b056f8.44429817' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b056f8.44429817' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdjYzgxLjMwNjE5MjY4In0= Dockerfile_6398516607cc81.30619268' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA1NmY4LjQ0NDI5ODE3In0= Dockerfile_63a0a680b056f8.44429817' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1265,10 +1242,10 @@ stages: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_6398516607ce23.11215291' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607ce23.11215291' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_63a0a680b05b72.09221218' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b05b72.09221218' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3Y2UyMy4xMTIxNTI5MSJ9 Dockerfile_6398516607ce23.11215291' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwNWI3Mi4wOTIyMTIxOCJ9 Dockerfile_63a0a680b05b72.09221218' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0-alpine' @@ -1290,10 +1267,10 @@ stages: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_6398516607cfa1.97577974' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607cfa1.97577974' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_63a0a680b06183.56794668' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b06183.56794668' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2NmYTEuOTc1Nzc5NzQifQ== Dockerfile_6398516607cfa1.97577974' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDYxODMuNTY3OTQ2NjgifQ== Dockerfile_63a0a680b06183.56794668' - 'docker push webdevops/php-nginx-dev:8.0-alpine' - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' @@ -1313,10 +1290,10 @@ stages: - 'cd docker/php-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_6398516607d0b3.25232223' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607d0b3.25232223' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_63a0a680b06602.98375138' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b06602.98375138' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2QwYjMuMjUyMzIyMjMifQ== Dockerfile_6398516607d0b3.25232223' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDY2MDIuOTgzNzUxMzgifQ== Dockerfile_63a0a680b06602.98375138' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0-alpine' @@ -1338,10 +1315,10 @@ stages: - 'cd docker/php-official/8.0' - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_6398516607db89.53377067' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607db89.53377067' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_63a0a680b08736.87757162' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b08736.87757162' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdkYjg5LjUzMzc3MDY3In0= Dockerfile_6398516607db89.53377067' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA4NzM2Ljg3NzU3MTYyIn0= Dockerfile_63a0a680b08736.87757162' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - 'docker push webdevops/php:8.0' @@ -1365,10 +1342,10 @@ stages: - 'cd docker/php-apache/8.0' - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_6398516607dd21.07921991' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607dd21.07921991' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_63a0a680b08c18.08247093' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b08c18.08247093' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZGQyMS4wNzkyMTk5MSJ9 Dockerfile_6398516607dd21.07921991' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOGMxOC4wODI0NzA5MyJ9 Dockerfile_63a0a680b08c18.08247093' - 'docker push webdevops/php-apache:8.0' - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' @@ -1388,10 +1365,10 @@ stages: - 'cd docker/php-apache-dev/8.0' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_6398516607de70.49246652' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607de70.49246652' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_63a0a680b09045.81770220' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09045.81770220' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjM5ODUxNjYwN2RlNzAuNDkyNDY2NTIifQ== Dockerfile_6398516607de70.49246652' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDkwNDUuODE3NzAyMjAifQ== Dockerfile_63a0a680b09045.81770220' - 'docker push webdevops/php-apache-dev:8.0' - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' @@ -1411,10 +1388,10 @@ stages: - 'cd docker/php-nginx/8.0' - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_6398516607e0b8.04714040' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607e0b8.04714040' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_63a0a680b09443.06654177' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09443.06654177' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzOTg1MTY2MDdlMGI4LjA0NzE0MDQwIn0= Dockerfile_6398516607e0b8.04714040' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA5NDQzLjA2NjU0MTc3In0= Dockerfile_63a0a680b09443.06654177' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0' @@ -1436,10 +1413,10 @@ stages: - 'cd docker/php-nginx-dev/8.0' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_6398516607e248.92337711' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607e248.92337711' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_63a0a680b09b87.90945850' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09b87.90945850' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZTI0OC45MjMzNzcxMSJ9 Dockerfile_6398516607e248.92337711' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOWI4Ny45MDk0NTg1MCJ9 Dockerfile_63a0a680b09b87.90945850' - 'docker push webdevops/php-nginx-dev:8.0' - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' @@ -1459,10 +1436,10 @@ stages: - 'cd docker/php-dev/8.0' - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_6398516607e3a7.91318455' - - 'echo "COPY conf/ /" >> Dockerfile_6398516607e3a7.91318455' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_63a0a680b09fb2.02765004' + - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09fb2.02765004' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82Mzk4NTE2NjA3ZTNhNy45MTMxODQ1NSJ9 Dockerfile_6398516607e3a7.91318455' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOWZiMi4wMjc2NTAwNCJ9 Dockerfile_63a0a680b09fb2.02765004' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0' diff --git a/ci/BLACKLIST b/ci/BLACKLIST index c0d340a59..431bea1d2 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -2,4 +2,5 @@ 7.0 7.1 7.2 -7.3 \ No newline at end of file +7.3 +ssh From 7a3f9845e2dc41c9134afde2134bf44428014a83 Mon Sep 17 00:00:00 2001 From: Aimeos Date: Sat, 7 Jan 2023 12:39:24 +0100 Subject: [PATCH 12/63] Added PHP gmp module --- template/Dockerfile/images/php.jinja2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 339bb56cd..de1f29998 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -49,6 +49,7 @@ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -82,6 +83,7 @@ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -176,6 +178,7 @@ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ @@ -214,6 +217,7 @@ pcre-dev \ gettext-dev \ freetype-dev \ + libgmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -261,6 +265,7 @@ bz2 \ calendar \ exif \ + gmp \ {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} ffi \ imagick \ @@ -351,6 +356,7 @@ pcre-dev \ gettext-dev \ freetype-dev \ + libgmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ From 9e498dac7553de540fae63158558b2ed53c3405a Mon Sep 17 00:00:00 2001 From: Aimeos Date: Sat, 7 Jan 2023 12:59:22 +0100 Subject: [PATCH 13/63] Fixed GMP development library for Alpine --- template/Dockerfile/images/php.jinja2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index de1f29998..898a07f0b 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -217,7 +217,7 @@ pcre-dev \ gettext-dev \ freetype-dev \ - libgmp-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -356,7 +356,7 @@ pcre-dev \ gettext-dev \ freetype-dev \ - libgmp-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ From e6c90679438f2a67d62afa673090a9d24ed3bb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Sun, 8 Jan 2023 09:32:02 +0100 Subject: [PATCH 14/63] task: add gmp --- docker/php-official/5.6/Dockerfile | 3 +++ docker/php-official/7.0/Dockerfile | 3 +++ docker/php-official/7.1-alpine/Dockerfile | 3 +++ docker/php-official/7.1/Dockerfile | 3 +++ docker/php-official/7.2-alpine/Dockerfile | 3 +++ docker/php-official/7.2/Dockerfile | 3 +++ docker/php-official/7.3-alpine/Dockerfile | 3 +++ docker/php-official/7.3/Dockerfile | 3 +++ docker/php-official/7.4-alpine/Dockerfile | 3 +++ docker/php-official/7.4/Dockerfile | 3 +++ docker/php-official/8.0-alpine/Dockerfile | 3 +++ docker/php-official/8.0/Dockerfile | 3 +++ docker/php-official/8.1-alpine/Dockerfile | 3 +++ docker/php-official/8.1/Dockerfile | 3 +++ docker/php-official/8.2-alpine/Dockerfile | 3 +++ docker/php-official/8.2/Dockerfile | 3 +++ 16 files changed, 48 insertions(+) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 0953a1976..722a67407 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -200,6 +202,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 79021199d..afc614d3e 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -205,6 +207,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 9a7db725b..d2a817e8e 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -152,6 +153,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -203,6 +205,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a13ec5969..c97d0f6b2 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -205,6 +207,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 5d3f863ee..cf3e55d3c 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -152,6 +153,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -207,6 +209,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 71dd6d72d..6fcf3cb59 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -204,6 +206,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 190b9c0b4..5589fa9b5 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -152,6 +153,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -207,6 +209,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index b69a08538..00bc3508f 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -204,6 +206,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index f915a1208..c301a01c4 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -155,6 +156,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ ffi \ imagick \ amqp \ @@ -210,6 +212,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 96d9df76e..b6865679d 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -146,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -203,6 +205,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 97d7e7116..c9351958d 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -155,6 +156,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ ffi \ imagick \ amqp \ @@ -210,6 +212,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 569eadf08..70c351aac 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -151,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -203,6 +205,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 42341d11f..3a9420b40 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -155,6 +156,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ ffi \ imagick \ amqp \ @@ -209,6 +211,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 9bdbdfcc6..f4152eab3 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -151,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -202,6 +204,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 113fcca8d..83ec09c8a 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -113,6 +113,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -155,6 +156,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ ffi \ imagick \ amqp \ @@ -209,6 +211,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 55c57dd9d..425d0a3ec 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -127,6 +127,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -151,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + gmp \ intl \ gettext \ ldap \ @@ -202,6 +204,7 @@ RUN set -x \ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ From 7d298f6a611a67c2f2b49e2d2fd408de6e3746f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Thu, 2 Mar 2023 09:51:41 +0000 Subject: [PATCH 15/63] fix: disable buildkit --- .gitlab-ci.yml | 120 ------------------------------------------ ci/src/JobBuilder.php | 3 -- 2 files changed, 123 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b84e5dae3..456ade3d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/toolbox/latest' - 'docker build --no-cache -t webdevops/toolbox:latest .' @@ -26,8 +24,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/storage/latest' - 'docker build --no-cache -t webdevops/storage:latest .' @@ -44,8 +40,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' @@ -71,8 +65,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' @@ -98,8 +90,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' @@ -125,8 +115,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/dockerfile-build-env/latest' - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' @@ -143,8 +131,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' @@ -166,8 +152,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' @@ -191,8 +175,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' @@ -216,8 +198,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' @@ -241,8 +221,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' @@ -264,8 +242,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' @@ -287,8 +263,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' @@ -314,8 +288,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' @@ -337,8 +309,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' @@ -360,8 +330,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' @@ -385,8 +353,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' @@ -408,8 +374,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' @@ -433,8 +397,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/7.4-alpine' - 'docker build --no-cache -t webdevops/php:7.4-alpine .' @@ -460,8 +422,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' @@ -483,8 +443,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' @@ -506,8 +464,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' @@ -531,8 +487,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' @@ -554,8 +508,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' @@ -579,8 +531,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/7.4' - 'docker build --no-cache -t webdevops/php:7.4 .' @@ -606,8 +556,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/7.4' - 'docker build --no-cache -t webdevops/php-apache:7.4 .' @@ -629,8 +577,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/7.4' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' @@ -652,8 +598,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/7.4' - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' @@ -677,8 +621,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/7.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' @@ -700,8 +642,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/7.4' - 'docker build --no-cache -t webdevops/php-dev:7.4 .' @@ -725,8 +665,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' @@ -752,8 +690,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' @@ -775,8 +711,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' @@ -798,8 +732,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' @@ -823,8 +755,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' @@ -846,8 +776,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' @@ -871,8 +799,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' @@ -898,8 +824,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' @@ -921,8 +845,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' @@ -944,8 +866,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' @@ -969,8 +889,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' @@ -992,8 +910,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' @@ -1017,8 +933,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' @@ -1044,8 +958,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' @@ -1067,8 +979,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' @@ -1090,8 +1000,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' @@ -1115,8 +1023,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' @@ -1138,8 +1044,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' @@ -1163,8 +1067,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' @@ -1190,8 +1092,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' @@ -1213,8 +1113,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' @@ -1236,8 +1134,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' @@ -1261,8 +1157,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' @@ -1284,8 +1178,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' @@ -1309,8 +1201,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-official/8.0' - 'docker build --no-cache -t webdevops/php:8.0 .' @@ -1336,8 +1226,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache/8.0' - 'docker build --no-cache -t webdevops/php-apache:8.0 .' @@ -1359,8 +1247,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-apache-dev/8.0' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' @@ -1382,8 +1268,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx/8.0' - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' @@ -1407,8 +1291,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-nginx-dev/8.0' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' @@ -1430,8 +1312,6 @@ stages: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env - variables: - DOCKER_BUILDKIT: '1' script: - 'cd docker/php-dev/8.0' - 'docker build --no-cache -t webdevops/php-dev:8.0 .' diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php index 4e76370aa..13faccd0c 100644 --- a/ci/src/JobBuilder.php +++ b/ci/src/JobBuilder.php @@ -21,9 +21,6 @@ private function getBasicJobDefinition(array $node) 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY', ], 'image' => 'webdevops/dockerfile-build-env', - 'variables' => [ - 'DOCKER_BUILDKIT' => '1', - ], 'script' => [], // 'retry' => 2, 'tags' => ['aws'], From 826504339a881ebf17af70287a5fd06d85fef1ba Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 31 Mar 2023 11:15:54 +0200 Subject: [PATCH 16/63] update go utils --- docker/toolbox/latest/Dockerfile | 6 +++--- template/Dockerfile/tools.jinja2 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index a5cff009c..fe846a53e 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -29,13 +29,13 @@ RUN apk add --no-cache \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.amd64" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ && ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.16/gosu-amd64" \ + && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.16/gosu-amd64.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index dd4227588..3e73a82f8 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,11 +1,11 @@ -{% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} +{% macro goreplace(path="/usr/local/bin", version="22.10.0") -%} ## Install go-replace - && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-64-linux" \ + && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.amd64" \ && chmod +x "{{ path }}/go-replace" \ && "{{ path }}/go-replace" --version {%- endmacro %} -{% macro gosu(path="/sbin", arch="amd64", version="1.10") -%} +{% macro gosu(path="/sbin", arch="amd64", version="1.16") -%} # Install gosu && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}" \ && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}.asc" \ From 2d0da8c0bb3228caf21c23a111ab60d66aa9942c Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sat, 1 Apr 2023 16:28:13 +0200 Subject: [PATCH 17/63] rollback gosu version --- docker/toolbox/latest/Dockerfile | 4 ++-- template/Dockerfile/tools.jinja2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index fe846a53e..780356b8d 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -34,8 +34,8 @@ RUN apk add --no-cache \ && "/baselayout/usr/local/bin/go-replace" --version \ && ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.16/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.16/gosu-amd64.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ + && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 3e73a82f8..458837ce9 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -5,7 +5,7 @@ && "{{ path }}/go-replace" --version {%- endmacro %} -{% macro gosu(path="/sbin", arch="amd64", version="1.16") -%} +{% macro gosu(path="/sbin", arch="amd64", version="1.10") -%} # Install gosu && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}" \ && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}.asc" \ From b1a730a9c874b149f954cc2549d1377d9285ea71 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Fri, 5 May 2023 07:07:41 +0200 Subject: [PATCH 18/63] updated icu from 66.1 to 73.1 Signed-off-by: Roger Sikorski --- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2-alpine/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3-alpine/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4-alpine/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 2 +- docker/php-official/8.0/Dockerfile | 2 +- docker/php-official/8.1-alpine/Dockerfile | 2 +- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 2 +- docker/php-official/8.2/Dockerfile | 2 +- template/Dockerfile/images/php.jinja2 | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 722a67407..218d9bdce 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index afc614d3e..76f56d47e 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index d2a817e8e..fd6ad22a8 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index c97d0f6b2..89e5de8f4 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index cf3e55d3c..e6b95366c 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 6fcf3cb59..70ccc4fbb 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 5589fa9b5..9f26a3aa5 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 00bc3508f..a03419855 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index c301a01c4..66ae3a851 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index b6865679d..9305f85fb 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index c9351958d..4152214ab 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 70c351aac..920246794 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 3a9420b40..89fd6c04c 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index f4152eab3..c585b910c 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 83ec09c8a..ecea3938e 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 425d0a3ec..d61be512d 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 898a07f0b..1ca36325e 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -57,7 +57,7 @@ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} @@ -245,7 +245,7 @@ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} From f29747eda928ccf5b8013456eeca8c7a5ba97dbe Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sun, 14 May 2023 17:32:27 +0200 Subject: [PATCH 19/63] fix missing imagick in alpine fix #486 --- docker/php-official/7.1-alpine/Dockerfile | 1 + docker/php-official/7.2-alpine/Dockerfile | 1 + docker/php-official/7.3-alpine/Dockerfile | 1 + docker/php-official/7.4-alpine/Dockerfile | 1 + docker/php-official/8.0-alpine/Dockerfile | 1 + docker/php-official/8.1-alpine/Dockerfile | 1 + docker/php-official/8.2-alpine/Dockerfile | 1 + template/Dockerfile/images/php.jinja2 | 1 + 8 files changed, 8 insertions(+) diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index d2a817e8e..1d86f5a7c 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index cf3e55d3c..892d2ecba 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 5589fa9b5..d6c6e72aa 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index c301a01c4..f9cf67ef9 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index c9351958d..4e8c59c72 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 3a9420b40..ec2662d0f 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 83ec09c8a..c0149e83b 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -101,6 +101,7 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 898a07f0b..472a5874f 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -205,6 +205,7 @@ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ From e18106b2d4b6c227298789e944cc2a3b3d83695f Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sun, 14 May 2023 17:39:01 +0200 Subject: [PATCH 20/63] update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c29b16623..848e9742d 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ Automated build and test running on [Gitlab CI](https://gitlab.com/webdevops/doc Or write an issue in our [GitHub repository](https://github.com/webdevops/Dockerfile/issues). +Or join our discord https://discord.gg/gnYPfZhX + ## Build process ### File generation @@ -38,6 +40,7 @@ config files from the `provisioning` directory. **The files in the `docker` directory are never modified manually** *This will be replaced with PHP twig templates in the future to streamline everything.* + ### Building in CI We generate a multi stage Gitlab-CI configuration using PHP: From e7bcc4056e36f667f2503182ebcadb13587353b3 Mon Sep 17 00:00:00 2001 From: Florian Schlittenbauer Date: Tue, 16 May 2023 15:52:15 +0200 Subject: [PATCH 21/63] [BUGFIX] re-add missing slashes and remove some trailing whitespaces --- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1-alpine/Dockerfile | 8 ++++---- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2-alpine/Dockerfile | 8 ++++---- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3-alpine/Dockerfile | 8 ++++---- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4-alpine/Dockerfile | 8 ++++---- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0-alpine/Dockerfile | 8 ++++---- docker/php-official/8.0/Dockerfile | 4 ++-- docker/php-official/8.1-alpine/Dockerfile | 6 +++--- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 6 +++--- docker/php-official/8.2/Dockerfile | 2 +- template/Dockerfile/images/php.jinja2 | 14 +++++++------- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 218d9bdce..10bd00791 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 76f56d47e..96a0a2aea 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 7110d76cc..d6e0982e0 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 89e5de8f4..70edfec3d 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 6ff12e8d4..b2284ae1f 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 70ccc4fbb..2cba3dfe8 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -159,7 +159,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index a727088bc..c4a26e972 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index a03419855..4b180bfcd 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -159,7 +159,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 10fbc753a..39c064747 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,8 +171,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 9305f85fb..bde891ae6 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -158,7 +158,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 6bb56ea67..34cc8050d 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,8 +171,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 920246794..da69e01c5 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -163,7 +163,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index d03d2ad9e..b059983a4 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,7 +171,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index c585b910c..b48e517fd 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 615f1dba0..c0efa5960 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,7 +171,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index d61be512d..b068021e6 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index f7fcba2dc..9f6e2a35d 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -57,7 +57,7 @@ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} @@ -100,9 +100,9 @@ pdo_pgsql \ pgsql \ soap \ - sockets \ -{%- if version != '8.1' and version != '8.2' %} - tokenizer \ + sockets \ +{%- if version != '8.1' and version != '8.2' %} + tokenizer \ {%- endif %} sysvmsg \ sysvsem \ @@ -246,7 +246,7 @@ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} @@ -286,9 +286,9 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} +{%- if version != '8.1' and version != '8.2' %} tokenizer \ -{%- endif %} +{%- endif %} sysvmsg \ sysvsem \ sysvshm \ From 6d0376d9a3331005d6bd644eee4d2b1fa6521394 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 6 Oct 2023 11:10:32 +0200 Subject: [PATCH 22/63] fix: amqp branch name --- docker/php-official/8.1-alpine/Dockerfile | 2 +- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 2 +- docker/php-official/8.2/Dockerfile | 2 +- template/Dockerfile/images/php.jinja2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index b059983a4..8e9c0526d 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index b48e517fd..51a24fc18 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -140,7 +140,7 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index c0efa5960..c7fc029cd 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index b068021e6..40a1fed8c 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -140,7 +140,7 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 9f6e2a35d..386e515db 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -253,7 +253,7 @@ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ {%- else %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ From 77195dbcc534f6ecca577054f36c69dc5ca913cf Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 6 Oct 2023 11:35:25 +0200 Subject: [PATCH 23/63] fix: amqp for older images --- docker/php-official/7.4-alpine/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 2 +- docker/php-official/8.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 39c064747..472d722b7 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 34cc8050d..6574c9b65 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index da69e01c5..16baa8c7d 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -140,7 +140,7 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ From 5a748ec77a3f71a5f3a9850ea16549b07e9f1b8a Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 4 Nov 2023 22:30:56 +0100 Subject: [PATCH 24/63] Bump copyrights --- documentation/docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/conf.py b/documentation/docs/conf.py index ad445e2ea..7594303f8 100644 --- a/documentation/docs/conf.py +++ b/documentation/docs/conf.py @@ -63,7 +63,7 @@ # General information about the project. project = u'Dockerfile Documentation' -copyright = u'2016, Team WebDevOps' +copyright = u'2016-2023, Team WebDevOps' author = u'Team WebDevOps' # The version info for the project you're documenting, acts as replacement for From ff3017b52fcb5eed43c3f517e05ee031afd16c56 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 4 Nov 2023 22:31:31 +0100 Subject: [PATCH 25/63] Fix typos --- .../DockerImages/dockerfiles/include/customization-apache.rst | 2 +- .../DockerImages/dockerfiles/include/customization-nginx.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/customization-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/include/customization-apache.rst index 59d8dac70..f49df989a 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/customization-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/customization-apache.rst @@ -6,4 +6,4 @@ This image has two directories for configuration files which will be automatic l For global configuration options the directory ``/opt/docker/etc/httpd/conf.d`` can be used. For vhost configuration options the directory ``/opt/docker/etc/httpd/vhost.common.d`` can be used. -Any ``*.conf`` files inside these direcories will be included either global or the vhost section. +Any ``*.conf`` files inside these directories will be included either global or the vhost section. diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/customization-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/include/customization-nginx.rst index 07be876fc..b129e6c0e 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/customization-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/customization-nginx.rst @@ -6,4 +6,4 @@ This image has two directories for configuration files which will be automatic l For global configuration options the directory ``/opt/docker/etc/nginx/conf.d`` can be used. For vhost configuration options the directory ``/opt/docker/etc/nginx/vhost.common.conf`` can be used. -Any ``*.conf`` files inside these direcories will be included either global or the vhost section. +Any ``*.conf`` files inside these directories will be included either global or the vhost section. From b550a1547d953454922e01294223d32849e8dddb Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 29 Nov 2023 13:29:27 +0100 Subject: [PATCH 26/63] php 8.3 --- conf/console.yml | 4 + docker/php-apache-dev/8.3-alpine/Dockerfile | 39 +++ .../8.3-alpine/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache-dev/8.3/Dockerfile | 32 ++ docker/php-apache-dev/8.3/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.3/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../8.3/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.3/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache/8.3-alpine/Dockerfile | 34 ++ .../php-apache/8.3-alpine/Dockerfile.jinja2 | 13 + .../conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.3-alpine/conf/bin/service.d/httpd.sh | 13 + .../8.3-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../conf/etc/httpd/conf.d/10-log.conf | 4 + .../conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../conf/etc/httpd/conf.d/10-server.conf | 18 + .../8.3-alpine/conf/etc/httpd/global.conf | 1 + .../8.3-alpine/conf/etc/httpd/main.conf | 10 + .../8.3-alpine/conf/etc/httpd/php.conf | 1 + .../8.3-alpine/conf/etc/httpd/ssl/server.crt | 28 ++ .../8.3-alpine/conf/etc/httpd/ssl/server.csr | 26 ++ .../8.3-alpine/conf/etc/httpd/ssl/server.key | 51 +++ .../conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../8.3-alpine/conf/etc/httpd/vhost.conf | 36 ++ .../8.3-alpine/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../conf/etc/supervisor.d/apache.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++++++ .../conf/provision/bootstrap.d/10-php.sh | 8 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-apache/8.3/Dockerfile | 30 ++ docker/php-apache/8.3/Dockerfile.jinja2 | 13 + .../8.3/conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.3/conf/bin/service.d/httpd.sh | 14 + .../8.3/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../8.3/conf/etc/httpd/conf.d/10-log.conf | 4 + .../8.3/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../8.3/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/8.3/conf/etc/httpd/global.conf | 1 + .../php-apache/8.3/conf/etc/httpd/main.conf | 10 + docker/php-apache/8.3/conf/etc/httpd/php.conf | 1 + .../8.3/conf/etc/httpd/ssl/server.crt | 28 ++ .../8.3/conf/etc/httpd/ssl/server.csr | 26 ++ .../8.3/conf/etc/httpd/ssl/server.key | 51 +++ .../8.3/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/8.3/conf/etc/httpd/vhost.conf | 36 ++ .../8.3/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../8.3/conf/etc/supervisor.d/apache.conf | 14 + .../8.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++++++ .../8.3/conf/provision/bootstrap.d/10-php.sh | 8 + .../8.3/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-dev/8.3-alpine/Dockerfile | 31 ++ docker/php-dev/8.3-alpine/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ docker/php-dev/8.3/Dockerfile | 24 ++ docker/php-dev/8.3/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.3/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.3/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ docker/php-nginx-dev/8.3-alpine/Dockerfile | 39 +++ .../8.3-alpine/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx-dev/8.3/Dockerfile | 32 ++ docker/php-nginx-dev/8.3/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.3/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../8.3/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../8.3/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx/8.3-alpine/Dockerfile | 25 ++ docker/php-nginx/8.3-alpine/Dockerfile.jinja2 | 14 + .../conf/bin/service.d/nginx.d/10-init.sh | 5 + .../8.3-alpine/conf/bin/service.d/nginx.sh | 10 + .../8.3-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../8.3-alpine/conf/etc/nginx/global.conf | 1 + .../8.3-alpine/conf/etc/nginx/main.conf | 4 + .../8.3-alpine/conf/etc/nginx/nginx.conf | 34 ++ .../8.3-alpine/conf/etc/nginx/php.conf | 1 + .../8.3-alpine/conf/etc/nginx/ssl/server.crt | 28 ++ .../8.3-alpine/conf/etc/nginx/ssl/server.csr | 26 ++ .../8.3-alpine/conf/etc/nginx/ssl/server.key | 51 +++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../8.3-alpine/conf/etc/nginx/vhost.conf | 28 ++ .../8.3-alpine/conf/etc/nginx/vhost.ssl.conf | 7 + .../conf/etc/supervisor.d/nginx.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../conf/provision/bootstrap.d/10-php.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 ++ docker/php-nginx/8.3/Dockerfile | 28 ++ docker/php-nginx/8.3/Dockerfile.jinja2 | 14 + .../8.3/conf/bin/service.d/nginx.d/10-init.sh | 5 + .../php-nginx/8.3/conf/bin/service.d/nginx.sh | 10 + .../8.3/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.3/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/8.3/conf/etc/nginx/global.conf | 1 + docker/php-nginx/8.3/conf/etc/nginx/main.conf | 4 + docker/php-nginx/8.3/conf/etc/nginx/php.conf | 1 + .../8.3/conf/etc/nginx/ssl/server.crt | 28 ++ .../8.3/conf/etc/nginx/ssl/server.csr | 26 ++ .../8.3/conf/etc/nginx/ssl/server.key | 51 +++ .../8.3/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/8.3/conf/etc/nginx/vhost.conf | 28 ++ .../8.3/conf/etc/nginx/vhost.ssl.conf | 7 + .../8.3/conf/etc/supervisor.d/nginx.conf | 14 + .../8.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../8.3/conf/provision/bootstrap.d/10-php.sh | 7 + .../8.3/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 ++ docker/php-official/5.6/Dockerfile | 6 +- docker/php-official/7.0/Dockerfile | 6 +- docker/php-official/7.1-alpine/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 6 +- docker/php-official/7.2-alpine/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 6 +- docker/php-official/7.3-alpine/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 6 +- docker/php-official/7.4-alpine/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 6 +- docker/php-official/8.0-alpine/Dockerfile | 4 +- .../php-official/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-official/8.0/Dockerfile | 6 +- docker/php-official/8.1-alpine/Dockerfile | 4 +- .../php-official/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-official/8.1/Dockerfile | 6 +- docker/php-official/8.2-alpine/Dockerfile | 4 +- .../php-official/8.2-alpine/Dockerfile.jinja2 | 4 +- docker/php-official/8.2/Dockerfile | 6 +- docker/php-official/8.3-alpine/Dockerfile | 247 +++++++++++++ .../php-official/8.3-alpine/Dockerfile.jinja2 | 38 ++ docker/php-official/8.3-alpine/conf/VERSION | 1 + .../8.3-alpine/conf/bin/bootstrap.sh | 3 + .../8.3-alpine/conf/bin/config.sh | 117 +++++++ .../8.3-alpine/conf/bin/control.sh | 160 +++++++++ .../8.3-alpine/conf/bin/entrypoint.d/cli.sh | 19 + .../conf/bin/entrypoint.d/default.sh | 3 + .../8.3-alpine/conf/bin/entrypoint.d/noop.sh | 7 + .../8.3-alpine/conf/bin/entrypoint.d/root.sh | 14 + .../conf/bin/entrypoint.d/supervisord.sh | 9 + .../8.3-alpine/conf/bin/entrypoint.sh | 46 +++ .../8.3-alpine/conf/bin/provision | 8 + .../8.3-alpine/conf/bin/provision.py | 328 ++++++++++++++++++ .../conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.3-alpine/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.3-alpine/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.3-alpine/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 ++ .../8.3-alpine/conf/bin/service.d/postfix.sh | 42 +++ .../conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.3-alpine/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 ++ .../conf/bin/usr-bin/docker-ansible-install | 77 ++++ .../conf/bin/usr-bin/docker-cronjob | 26 ++ .../conf/bin/usr-bin/docker-php-setting | 44 +++ .../conf/bin/usr-bin/docker-provision | 9 + .../conf/bin/usr-bin/docker-service | 89 +++++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../8.3-alpine/conf/bin/usr-bin/service | 86 +++++ .../conf/bin/usr-bin/version-compare | 43 +++ .../8.3-alpine/conf/etc/cron/.gitkeep | 0 .../8.3-alpine/conf/etc/logrotate.d/php5-fpm | 12 + .../8.3-alpine/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.3-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.3-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.3-alpine/conf/etc/php/php.ini | 1 + .../8.3-alpine/conf/etc/php/php.webdevops.ini | 34 ++ .../8.3-alpine/conf/etc/supervisor.conf | 20 ++ .../8.3-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 + .../conf/etc/supervisor.d/dnsmasq.conf | 14 + .../conf/etc/supervisor.d/php-fpm.conf | 15 + .../conf/etc/supervisor.d/postfix.conf | 15 + .../8.3-alpine/conf/etc/supervisor.d/ssh.conf | 14 + .../conf/etc/supervisor.d/syslog.conf | 13 + .../conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../8.3-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 8 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 +++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 +++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 +++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++++ .../conf/provision/entrypoint.d/20-php.sh | 75 ++++ .../conf/provision/onbuild.d/.gitkeep | 0 .../8.3-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 + .../conf/provision/service.d/dnsmasq.sh | 24 ++ .../conf/provision/service.d/postfix.sh | 32 ++ .../conf/provision/service.d/ssh.sh | 17 + .../conf/provision/service.d/syslog.sh | 41 +++ .../conf/provision/variables-webdevops.yml | 7 + .../8.3-alpine/conf/provision/variables.yml | 7 + docker/php-official/8.3/Dockerfile | 220 ++++++++++++ docker/php-official/8.3/Dockerfile.jinja2 | 37 ++ docker/php-official/8.3/conf/VERSION | 1 + docker/php-official/8.3/conf/bin/bootstrap.sh | 3 + docker/php-official/8.3/conf/bin/config.sh | 117 +++++++ docker/php-official/8.3/conf/bin/control.sh | 160 +++++++++ .../8.3/conf/bin/entrypoint.d/cli.sh | 19 + .../8.3/conf/bin/entrypoint.d/default.sh | 3 + .../8.3/conf/bin/entrypoint.d/noop.sh | 7 + .../8.3/conf/bin/entrypoint.d/root.sh | 14 + .../8.3/conf/bin/entrypoint.d/supervisord.sh | 9 + .../php-official/8.3/conf/bin/entrypoint.sh | 46 +++ docker/php-official/8.3/conf/bin/provision | 8 + docker/php-official/8.3/conf/bin/provision.py | 328 ++++++++++++++++++ .../8.3/conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.3/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.3/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.3/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 ++ .../8.3/conf/bin/service.d/postfix.sh | 42 +++ .../8.3/conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.3/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../8.3/conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../8.3/conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 ++ .../conf/bin/usr-bin/docker-ansible-install | 77 ++++ .../8.3/conf/bin/usr-bin/docker-cronjob | 26 ++ .../8.3/conf/bin/usr-bin/docker-php-setting | 44 +++ .../8.3/conf/bin/usr-bin/docker-provision | 9 + .../8.3/conf/bin/usr-bin/docker-service | 89 +++++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../php-official/8.3/conf/bin/usr-bin/service | 86 +++++ .../8.3/conf/bin/usr-bin/version-compare | 43 +++ .../php-official/8.3/conf/etc/cron/.gitkeep | 0 .../8.3/conf/etc/logrotate.d/php5-fpm | 12 + .../8.3/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.3/conf/etc/php/conf.d/.gitkeep | 0 .../8.3/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.3/conf/etc/php/php.ini | 1 + .../8.3/conf/etc/php/php.webdevops.ini | 34 ++ .../php-official/8.3/conf/etc/supervisor.conf | 20 ++ .../8.3/conf/etc/supervisor.d/.gitkeep | 0 .../8.3/conf/etc/supervisor.d/cron.conf | 14 + .../8.3/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../8.3/conf/etc/supervisor.d/php-fpm.conf | 15 + .../8.3/conf/etc/supervisor.d/postfix.conf | 15 + .../8.3/conf/etc/supervisor.d/ssh.conf | 14 + .../8.3/conf/etc/supervisor.d/syslog.conf | 13 + .../8.3/conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../8.3/conf/provision/ansible.cfg | 0 .../8.3/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 10 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../8.3/conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 +++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 +++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 +++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../8.3/conf/provision/build.d/.gitkeep | 0 .../8.3/conf/provision/build.d/10-cleanup.sh | 7 + .../8.3/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++++ .../8.3/conf/provision/entrypoint.d/20-php.sh | 75 ++++ .../8.3/conf/provision/onbuild.d/.gitkeep | 0 .../8.3/conf/provision/roles/.gitkeep | 0 .../8.3/conf/provision/service.d/.gitkeep | 0 .../8.3/conf/provision/service.d/cron.sh | 13 + .../8.3/conf/provision/service.d/dnsmasq.sh | 24 ++ .../8.3/conf/provision/service.d/postfix.sh | 32 ++ .../8.3/conf/provision/service.d/ssh.sh | 17 + .../8.3/conf/provision/service.d/syslog.sh | 41 +++ .../conf/provision/variables-webdevops.yml | 7 + .../8.3/conf/provision/variables.yml | 7 + docker/php/8.3 | 1 + docker/php/8.3-alpine | 1 + template/Dockerfile/images/apache.jinja2 | 12 + template/Dockerfile/images/bootstrap.jinja2 | 4 + template/Dockerfile/images/php.jinja2 | 40 ++- 386 files changed, 8140 insertions(+), 59 deletions(-) create mode 100644 docker/php-apache-dev/8.3-alpine/Dockerfile create mode 100644 docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache-dev/8.3/Dockerfile create mode 100644 docker/php-apache-dev/8.3/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache/8.3-alpine/Dockerfile create mode 100644 docker/php-apache/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-apache/8.3/Dockerfile create mode 100644 docker/php-apache/8.3/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.3/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.3/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.3/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.3/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.3/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-dev/8.3-alpine/Dockerfile create mode 100644 docker/php-dev/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.3-alpine/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/8.3/Dockerfile create mode 100644 docker/php-dev/8.3/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/Dockerfile create mode 100644 docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx-dev/8.3/Dockerfile create mode 100644 docker/php-nginx-dev/8.3/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx/8.3-alpine/Dockerfile create mode 100644 docker/php-nginx/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-nginx/8.3/Dockerfile create mode 100644 docker/php-nginx/8.3/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.3/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.3/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.3/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-official/8.3-alpine/Dockerfile create mode 100644 docker/php-official/8.3-alpine/Dockerfile.jinja2 create mode 100644 docker/php-official/8.3-alpine/conf/VERSION create mode 100644 docker/php-official/8.3-alpine/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/config.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/control.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.3-alpine/conf/bin/provision create mode 100755 docker/php-official/8.3-alpine/conf/bin/provision.py create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.3-alpine/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/etc/php/php.ini create mode 100644 docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.3-alpine/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.3-alpine/conf/provision/variables.yml create mode 100644 docker/php-official/8.3/Dockerfile create mode 100644 docker/php-official/8.3/Dockerfile.jinja2 create mode 100644 docker/php-official/8.3/conf/VERSION create mode 100644 docker/php-official/8.3/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.3/conf/bin/config.sh create mode 100644 docker/php-official/8.3/conf/bin/control.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.3/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.3/conf/bin/provision create mode 100755 docker/php-official/8.3/conf/bin/provision.py create mode 100644 docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.3/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.3/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.3/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.3/conf/etc/php/php.ini create mode 100644 docker/php-official/8.3/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.3/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.3/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.3/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.3/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.3/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.3/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.3/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.3/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.3/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.3/conf/provision/variables.yml create mode 120000 docker/php/8.3 create mode 120000 docker/php/8.3-alpine diff --git a/conf/console.yml b/conf/console.yml index 2a5ee2a05..870ee01af 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,6 +43,10 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' + 'php:8:3$': + OS_FAMILY: 'debian' + OS_VERSION: '12' + PHP_OFFICIAL: '1' 'php[^:]*:[0-9]': OS_FAMILY: 'debian' OS_VERSION: '10' diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..82a6f079b --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile @@ -0,0 +1,39 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.3-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..7924efa27 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.3-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.3") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/8.3/Dockerfile b/docker/php-apache-dev/8.3/Dockerfile new file mode 100644 index 000000000..7f0229c9b --- /dev/null +++ b/docker/php-apache-dev/8.3/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.3 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.3/Dockerfile.jinja2 b/docker/php-apache-dev/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..855594a44 --- /dev/null +++ b/docker/php-apache-dev/8.3/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.3") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.3") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/8.3-alpine/Dockerfile b/docker/php-apache/8.3-alpine/Dockerfile new file mode 100644 index 000000000..d517235ce --- /dev/null +++ b/docker/php-apache/8.3-alpine/Dockerfile @@ -0,0 +1,34 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apk-install \ + apache2 \ + apache2-ctl \ + apache2-utils \ + apache2-proxy \ + apache2-ssl \ + # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) + && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/httpd.conf \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..8c360939f --- /dev/null +++ b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.3-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f88544c62 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/8.3/Dockerfile b/docker/php-apache/8.3/Dockerfile new file mode 100644 index 000000000..8ab3333e3 --- /dev/null +++ b/docker/php-apache/8.3/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apt-install \ + apache2 \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.3/Dockerfile.jinja2 b/docker/php-apache/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..b4b658c7c --- /dev/null +++ b/docker/php-apache/8.3/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.3") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.debian12() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.3/conf/bin/service.d/httpd.sh b/docker/php-apache/8.3/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..1d871e7ea --- /dev/null +++ b/docker/php-apache/8.3/conf/bin/service.d/httpd.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.3/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.3/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.3/conf/etc/httpd/global.conf b/docker/php-apache/8.3/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.3/conf/etc/httpd/main.conf b/docker/php-apache/8.3/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.3/conf/etc/httpd/php.conf b/docker/php-apache/8.3/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.3/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.3/conf/etc/httpd/vhost.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.3/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.3/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-dev/8.3-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..fedef5964 --- /dev/null +++ b/docker/php-dev/8.3-alpine/Dockerfile @@ -0,0 +1,31 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3-alpine + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..da1b39185 --- /dev/null +++ b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.3-alpine") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.3") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.3-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.3-alpine/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.3/Dockerfile b/docker/php-dev/8.3/Dockerfile new file mode 100644 index 000000000..88fbc5333 --- /dev/null +++ b/docker/php-dev/8.3/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.3/Dockerfile.jinja2 b/docker/php-dev/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..da25979d1 --- /dev/null +++ b/docker/php-dev/8.3/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.3") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.3") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..d7867c77d --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile @@ -0,0 +1,39 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.2-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..e2a5982ff --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.2-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/8.3/Dockerfile b/docker/php-nginx-dev/8.3/Dockerfile new file mode 100644 index 000000000..110c2a3ee --- /dev/null +++ b/docker/php-nginx-dev/8.3/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.3 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.3/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..9a8645c6b --- /dev/null +++ b/docker/php-nginx-dev/8.3/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.3") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.3") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/8.3-alpine/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile new file mode 100644 index 000000000..866d63117 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && apk-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..c6558fc42 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.3-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..b9cb4ebc4 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf @@ -0,0 +1,34 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /docker.stdout; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /docker.stdout main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..109fbb31b --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + listen [::]:443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/8.3/Dockerfile b/docker/php-nginx/8.3/Dockerfile new file mode 100644 index 000000000..035035f8d --- /dev/null +++ b/docker/php-nginx/8.3/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.3 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + >> /etc/apt/sources.list \ + && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.3/Dockerfile.jinja2 b/docker/php-nginx/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..2683460dc --- /dev/null +++ b/docker/php-nginx/8.3/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.3") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.3/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.3/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.3/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.3/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.3/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.3/conf/etc/nginx/global.conf b/docker/php-nginx/8.3/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.3/conf/etc/nginx/main.conf b/docker/php-nginx/8.3/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/php.conf b/docker/php-nginx/8.3/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..109fbb31b --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + listen [::]:443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.3/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.3/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 10bd00791..6b5cac51f 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 96a0a2aea..5ae253d87 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index d6e0982e0..3ae5527cf 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 70edfec3d..239e347a7 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index b2284ae1f..e8fbb75ab 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 2cba3dfe8..cf8817b55 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index c4a26e972..db2860589 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 4b180bfcd..af4cbd357 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 472d722b7..24fd9c8c4 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index bde891ae6..780894e0a 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 6574c9b65..9ee163a27 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.12/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.16/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 index f16042680..2d77b6d42 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -15,7 +15,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.12') }} + {{ bootstrap.alpine('3.16') }} RUN set -x \ {{ base.alpine() }} \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 16baa8c7d..2f297fb63 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 8e9c0526d..bbd2c97d6 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.12/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index b5e4c40d0..d173c0ed8 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -15,7 +15,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.12') }} + {{ bootstrap.alpine('3.18') }} RUN set -x \ {{ base.alpine() }} \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 51a24fc18..b0c91d8b1 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index c7fc029cd..2e0926ff4 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.12/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff diff --git a/docker/php-official/8.2-alpine/Dockerfile.jinja2 b/docker/php-official/8.2-alpine/Dockerfile.jinja2 index 1c2ea95d4..7d2ee3bfb 100644 --- a/docker/php-official/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.2-alpine/Dockerfile.jinja2 @@ -15,7 +15,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.12') }} + {{ bootstrap.alpine('3.18') }} RUN set -x \ {{ base.alpine() }} \ @@ -28,7 +28,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.officialAlpine(version='8.1') }} \ + {{ php.officialAlpine(version='8.2') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 40a1fed8c..d96fbd472 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,10 +96,10 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ - libxslt1.1 \ zlibc \ + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile new file mode 100644 index 000000000..49fcbc803 --- /dev/null +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -0,0 +1,247 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.3-fpm-alpine + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + # Add community + && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + # System update + && /usr/local/bin/apk-upgrade \ + # Install base stuff + && apk-install \ + bash \ + ca-certificates \ + openssl \ + && update-ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ + ## Fix su execution (eg for tests) + && mkdir -p /etc/pam.d/ \ + && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su + +RUN set -x \ + # Install services + && chmod +x /opt/docker/bin/* \ + && apk-install \ + supervisor \ + wget \ + curl \ + vim \ + sed \ + tzdata \ + busybox-suid \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + && apk-install shadow \ + && apk-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + drill \ + ldns \ + openssh-client \ + rsync \ + patch \ + git \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apk-install \ + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + pngcrush \ + optipng \ + pngquant \ + vips \ + rabbitmq-c \ + c-client \ + # Libraries + libldap \ + icu-libs \ + libintl \ + libpq \ + libxslt \ + libgomp \ + libzip \ + libmemcached \ + yaml \ + # Build dependencies + linux-headers \ + autoconf \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + imagemagick-dev \ + rabbitmq-c-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # https://github.com/docker-library/php/issues/240 + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gmp \ + ffi \ + imagick \ + amqp \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Install extensions for PHP 7.x + # Memcached for 7.3 can currently only be built from master + && MEMCACHED="`mktemp -d`" \ + && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ + && docker-php-ext-configure $MEMCACHED \ + && docker-php-ext-install $MEMCACHED \ + && rm -rf $MEMCACHED \ + && pecl install apcu \ + && pecl install vips \ + && pecl install yaml \ + && pecl install redis \ + && pecl install mongodb \ + && pecl install xmlrpc-1.0.0RC3 \ + && docker-php-ext-enable \ + apcu \ + vips \ + yaml \ + redis \ + xmlrpc \ + imagick \ + mongodb \ + # Uninstall dev and header packages + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + rabbitmq-c-dev \ + imagemagick-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.3-alpine/Dockerfile.jinja2 b/docker/php-official/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..9cb68558b --- /dev/null +++ b/docker/php-official/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,38 @@ + +{{ docker.fromOfficial("php", "8.3-fpm-alpine") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} +{{ environment.phpAlpineIconvWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.alpine('3.18') }} + +RUN set -x \ + {{ base.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.officialAlpine(version='8.3') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.3-alpine/conf/VERSION b/docker/php-official/8.3-alpine/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.3-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.3-alpine/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.3-alpine/conf/bin/config.sh b/docker/php-official/8.3-alpine/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.3-alpine/conf/bin/control.sh b/docker/php-official/8.3-alpine/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.3-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.3-alpine/conf/bin/provision b/docker/php-official/8.3-alpine/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.3-alpine/conf/bin/provision.py b/docker/php-official/8.3-alpine/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..5af135768 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/service b/docker/php-official/8.3-alpine/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/etc/php/php.ini b/docker/php-official/8.3-alpine/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.3-alpine/conf/provision/ansible.cfg b/docker/php-official/8.3-alpine/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..7a7b42f6b --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Add group +addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" + diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..71caa48d3 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu|Alpine) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..18a6a9e47 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.3-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.3-alpine/conf/provision/variables.yml b/docker/php-official/8.3-alpine/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.3-alpine/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile new file mode 100644 index 000000000..165e2bacc --- /dev/null +++ b/docker/php-official/8.3/Dockerfile @@ -0,0 +1,220 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.3 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.3-fpm-bookworm + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + gnupg + +RUN set -x \ + # Install packages + && chmod +x /opt/docker/bin/* \ + && apt-install \ + supervisor \ + wget \ + curl \ + vim \ + net-tools \ + tzdata \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install services + && apt-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + patch \ + && /usr/local/bin/generate-locales \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + libjpeg-turbo-progs \ + pngcrush \ + optipng \ + apngopt \ + pngnq \ + pngquant \ + # Libraries + libvips42 \ + librabbitmq4 \ + libldap-2.5-0 \ + libxslt1.1 \ + zlib1g \ + libpq5 \ + libpng16-16 \ + libmcrypt4 \ + libzip4 \ + # Dev and headers + libjpeg62-turbo-dev \ + libwebp-dev \ + libfreetype6-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + libc-client-dev \ + libc-client2007e-dev \ + libkrb5-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + amqp \ + imagick \ + bz2 \ + calendar \ + exif \ + gmp \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + && pecl install memcached \ + && pecl install apcu \ + && pecl install xmlrpc-1.0.0RC3 \ + && pecl install vips \ + && pecl install redis \ + && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libc-client-dev \ + libkrb5-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng-dev \ + libwebp-dev \ + libpq-dev \ + libzip-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.3/Dockerfile.jinja2 b/docker/php-official/8.3/Dockerfile.jinja2 new file mode 100644 index 000000000..3b314c4f3 --- /dev/null +++ b/docker/php-official/8.3/Dockerfile.jinja2 @@ -0,0 +1,37 @@ + +{{ docker.fromOfficial("php", "8.3-fpm-bookworm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.debian('bookworm') }} + +RUN set -x \ + {{ base.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.official(version='8.3',distribution='bookworm') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.3/conf/VERSION b/docker/php-official/8.3/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.3/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.3/conf/bin/bootstrap.sh b/docker/php-official/8.3/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.3/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.3/conf/bin/config.sh b/docker/php-official/8.3/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.3/conf/bin/control.sh b/docker/php-official/8.3/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.3/conf/bin/entrypoint.sh b/docker/php-official/8.3/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.3/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.3/conf/bin/provision b/docker/php-official/8.3/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.3/conf/bin/provision.py b/docker/php-official/8.3/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.3/conf/bin/service.d/cron.sh b/docker/php-official/8.3/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..b5fa80dd3 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.3/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.3/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.3/conf/bin/service.d/postfix.sh b/docker/php-official/8.3/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.3/conf/bin/service.d/ssh.sh b/docker/php-official/8.3/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.3/conf/bin/service.d/supervisor.sh b/docker/php-official/8.3/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-provision b/docker/php-official/8.3/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service b/docker/php-official/8.3/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.3/conf/bin/usr-bin/service b/docker/php-official/8.3/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.3/conf/bin/usr-bin/version-compare b/docker/php-official/8.3/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.3/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.3/conf/etc/cron/.gitkeep b/docker/php-official/8.3/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.3/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/etc/php/php.ini b/docker/php-official/8.3/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.3/conf/etc/php/php.webdevops.ini b/docker/php-official/8.3/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.3/conf/etc/supervisor.conf b/docker/php-official/8.3/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.3/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.3/conf/provision/ansible.cfg b/docker/php-official/8.3/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..5bc865e80 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Add group +groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" + +# Assign user to group +usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..c1e716300 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..18a6a9e47 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.3/conf/provision/build.d/.gitkeep b/docker/php-official/8.3/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.3/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.3/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/roles/.gitkeep b/docker/php-official/8.3/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/service.d/.gitkeep b/docker/php-official/8.3/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.3/conf/provision/service.d/cron.sh b/docker/php-official/8.3/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.3/conf/provision/service.d/postfix.sh b/docker/php-official/8.3/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.3/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.3/conf/provision/service.d/ssh.sh b/docker/php-official/8.3/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.3/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.3/conf/provision/service.d/syslog.sh b/docker/php-official/8.3/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.3/conf/provision/variables-webdevops.yml b/docker/php-official/8.3/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.3/conf/provision/variables.yml b/docker/php-official/8.3/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.3/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.3 b/docker/php/8.3 new file mode 120000 index 000000000..ac8f4df77 --- /dev/null +++ b/docker/php/8.3 @@ -0,0 +1 @@ +../php-official/8.3 \ No newline at end of file diff --git a/docker/php/8.3-alpine b/docker/php/8.3-alpine new file mode 120000 index 000000000..66e9a3575 --- /dev/null +++ b/docker/php/8.3-alpine @@ -0,0 +1 @@ +../php-official/8.3-alpine/ \ No newline at end of file diff --git a/template/Dockerfile/images/apache.jinja2 b/template/Dockerfile/images/apache.jinja2 index 42f35b010..83eb6c25d 100644 --- a/template/Dockerfile/images/apache.jinja2 +++ b/template/Dockerfile/images/apache.jinja2 @@ -86,6 +86,18 @@ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires {%- endmacro %} +{% macro debian12(role='') -%} + # Install apache + && apt-install \ + apache2 \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires +{%- endmacro %} + {% macro ubuntu12(role='') -%} # Install apache diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 4186dcb4c..e4c723996 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -35,7 +35,11 @@ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free +{%- if distribution == 'bookworm' %} + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ +{%- else %} && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ +{%- endif %} && apt-update \ # System update && /usr/local/bin/apt-upgrade \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 386e515db..9002455c1 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -2,7 +2,7 @@ {% import 'Dockerfile/provision.jinja2' as provision %} {% import 'Dockerfile/services.jinja2' as services %} -{% macro official(role='', version='') -%} +{% macro official(role='', version='', distribution='') -%} # Install php environment && apt-install \ # Install tools @@ -19,9 +19,13 @@ # Libraries libvips42 \ librabbitmq4 \ +{%- if distribution == 'bookworm' %} + libldap-2.5-0 \ +{%- else %} libldap-2.4-2 \ - libxslt1.1 \ zlibc \ +{%- endif %} + libxslt1.1 \ zlib1g \ libpq5 \ libpng16-16 \ @@ -60,15 +64,15 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- else %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' %} - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} @@ -76,7 +80,7 @@ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ -{%- if version == '8.0' or version == '8.1' or version == '8.2' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} amqp \ imagick \ {%- endif %} @@ -92,7 +96,7 @@ mcrypt \ {%- endif %} imap \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} hash \ {%- endif %} pcntl \ @@ -101,14 +105,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} xmlrpc \ {%- endif %} xsl \ @@ -128,7 +132,7 @@ && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ -{%- elif version == '8.0' or version == '8.1' or version == '8.2' %} +{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && pecl install memcached \ && pecl install apcu \ && pecl install xmlrpc-1.0.0RC3 \ @@ -249,7 +253,7 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ @@ -267,7 +271,7 @@ calendar \ exif \ gmp \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} ffi \ imagick \ amqp \ @@ -277,7 +281,7 @@ ldap \ mysqli \ imap \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} hash \ {%- endif %} pcntl \ @@ -286,14 +290,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} xmlrpc \ {%- endif %} xsl \ @@ -302,7 +306,7 @@ gettext \ opcache \ # Install extensions for PHP 7.x - {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} + {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ @@ -313,7 +317,7 @@ && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ && docker-php-ext-enable memcached \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && pecl install apcu \ && pecl install vips \ && pecl install yaml \ @@ -392,7 +396,7 @@ && apt-install tideways-php tideways-daemon \ {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' %} + {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ From e94022da634eb83c84846d11ab38a08a16652cf7 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 29 Nov 2023 16:10:22 +0100 Subject: [PATCH 27/63] enable 8.3 for building --- .gitlab-ci.yml | 1324 +++++++++++++++++++++++++++++------------------- 1 file changed, 796 insertions(+), 528 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 456ade3d9..c5c17c86e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,22 +18,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' tags: - aws -'webdevops/storage:latest': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/storage/latest' - - 'docker build --no-cache -t webdevops/storage:latest .' - - 'docker push webdevops/storage:latest' - - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' - - 'docker push $CI_REGISTRY_IMAGE/storage:latest' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' 'webdevops/bootstrap:ubuntu-22.04': stage: level2 before_script: @@ -44,10 +28,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_63a0a680aec4f2.12028252' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aec4f2.12028252' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65675433b1c613.70189558' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1c613.70189558' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWM0ZjIuMTIwMjgyNTIifQ== Dockerfile_63a0a680aec4f2.12028252' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWM2MTMuNzAxODk1NTgifQ== Dockerfile_65675433b1c613.70189558' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -69,10 +53,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_63a0a680aecb48.24914626' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aecb48.24914626' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65675433b1c953.60291897' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1c953.60291897' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVjYjQ4LjI0OTE0NjI2In0= Dockerfile_63a0a680aecb48.24914626' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFjOTUzLjYwMjkxODk3In0= Dockerfile_65675433b1c953.60291897' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -94,10 +78,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_63a0a680aed031.81902440' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aed031.81902440' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65675433b1cbb2.77709423' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1cbb2.77709423' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZDAzMS44MTkwMjQ0MCJ9 Dockerfile_63a0a680aed031.81902440' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxY2JiMi43NzcwOTQyMyJ9 Dockerfile_65675433b1cbb2.77709423' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -135,10 +119,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_63a0a680aedd98.99659479' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aedd98.99659479' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65675433b1d1e0.15406481' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d1e0.15406481' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZGQ5OC45OTY1OTQ3OSJ9 Dockerfile_63a0a680aedd98.99659479' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZDFlMC4xNTQwNjQ4MSJ9 Dockerfile_65675433b1d1e0.15406481' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -156,10 +140,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_63a0a680aee1e5.53977971' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aee1e5.53977971' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65675433b1d4a8.01604611' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d4a8.01604611' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVlMWU1LjUzOTc3OTcxIn0= Dockerfile_63a0a680aee1e5.53977971' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkNGE4LjAxNjA0NjExIn0= Dockerfile_65675433b1d4a8.01604611' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -179,10 +163,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_63a0a680aee655.71582294' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aee655.71582294' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65675433b1d6a6.87940769' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d6a6.87940769' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZTY1NS43MTU4MjI5NCJ9 Dockerfile_63a0a680aee655.71582294' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZDZhNi44Nzk0MDc2OSJ9 Dockerfile_65675433b1d6a6.87940769' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -202,10 +186,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_63a0a680aeeaa5.87446012' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aeeaa5.87446012' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65675433b1d832.87943911' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d832.87943911' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWVhYTUuODc0NDYwMTIifQ== Dockerfile_63a0a680aeeaa5.87446012' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWQ4MzIuODc5NDM5MTEifQ== Dockerfile_65675433b1d832.87943911' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -225,10 +209,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_63a0a680aeef11.41945885' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aeef11.41945885' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65675433b1da61.91194083' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1da61.91194083' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZWVmMTEuNDE5NDU4ODUifQ== Dockerfile_63a0a680aeef11.41945885' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWRhNjEuOTExOTQwODMifQ== Dockerfile_65675433b1da61.91194083' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -246,10 +230,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_63a0a680aef379.68189984' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aef379.68189984' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65675433b1dc44.69319365' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1dc44.69319365' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVmMzc5LjY4MTg5OTg0In0= Dockerfile_63a0a680aef379.68189984' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkYzQ0LjY5MzE5MzY1In0= Dockerfile_65675433b1dc44.69319365' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -267,10 +251,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_63a0a680aef786.81226694' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aef786.81226694' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65675433b1de49.34274472' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1de49.34274472' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWVmNzg2LjgxMjI2Njk0In0= Dockerfile_63a0a680aef786.81226694' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkZTQ5LjM0Mjc0NDcyIn0= Dockerfile_65675433b1de49.34274472' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -282,48 +266,6 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1' - - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_63a0a680aefc48.06046439' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680aefc48.06046439' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFlZmM0OC4wNjA0NjQzOSJ9 Dockerfile_63a0a680aefc48.06046439' - - 'docker push webdevops/php-apache:8.1' - - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-apache-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_63a0a680af0198.61797607' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0198.61797607' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjAxOTguNjE3OTc2MDcifQ== Dockerfile_63a0a680af0198.61797607' - - 'docker push webdevops/php-apache-dev:8.1' - - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php-apache:8.1' 'webdevops/php-nginx:8.1': stage: level3 before_script: @@ -334,10 +276,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_63a0a680af05b4.16893204' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af05b4.16893204' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65675433b1e128.55411430' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e128.55411430' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWYwNWI0LjE2ODkzMjA0In0= Dockerfile_63a0a680af05b4.16893204' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFlMTI4LjU1NDExNDMwIn0= Dockerfile_65675433b1e128.55411430' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -357,10 +299,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_63a0a680af0a74.03572072' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0a74.03572072' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65675433b1e318.02772426' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e318.02772426' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMGE3NC4wMzU3MjA3MiJ9 Dockerfile_63a0a680af0a74.03572072' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTMxOC4wMjc3MjQyNiJ9 Dockerfile_65675433b1e318.02772426' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -378,10 +320,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_63a0a680af0e97.36035783' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af0e97.36035783' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65675433b1e4b8.41123325' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e4b8.41123325' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMGU5Ny4zNjAzNTc4MyJ9 Dockerfile_63a0a680af0e97.36035783' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTRiOC40MTEyMzMyNSJ9 Dockerfile_65675433b1e4b8.41123325' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -391,73 +333,73 @@ stages: - aws needs: - 'webdevops/php:8.1' -'webdevops/php:7.4-alpine': - stage: level2 +'webdevops/php-apache:8.1': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/7.4-alpine' - - 'docker build --no-cache -t webdevops/php:7.4-alpine .' + - 'cd docker/php-apache/8.1' + - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_63a0a680af2c81.56562395' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af2c81.56562395' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65675433b1e674.40989087' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e674.40989087' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMmM4MS41NjU2MjM5NSJ9 Dockerfile_63a0a680af2c81.56562395' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - - 'docker push webdevops/php:7.4-alpine' - - 'docker tag webdevops/php:7.4-alpine $CI_REGISTRY_IMAGE/php:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:7.4-alpine' - - 'docker tag webdevops/php:7.4-alpine webdevops/php-official:7.4-alpine' - - 'docker push webdevops/php-official:7.4-alpine' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTY3NC40MDk4OTA4NyJ9 Dockerfile_65675433b1e674.40989087' + - 'docker push webdevops/php-apache:8.1' + - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-apache:7.4-alpine': - stage: level3 + - 'webdevops/php:8.1' +'webdevops/php-apache-dev:8.1': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' + - 'cd docker/php-apache-dev/8.1' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_63a0a680af30e3.44124635' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af30e3.44124635' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65675433b1e819.32667280' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e819.32667280' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjMwZTMuNDQxMjQ2MzUifQ== Dockerfile_63a0a680af30e3.44124635' - - 'docker push webdevops/php-apache:7.4-alpine' - - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWU4MTkuMzI2NjcyODAifQ== Dockerfile_65675433b1e819.32667280' + - 'docker push webdevops/php-apache-dev:8.1' + - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' tags: - aws needs: - - 'webdevops/php:7.4-alpine' -'webdevops/php-apache-dev:7.4-alpine': - stage: level4 + - 'webdevops/php-apache:8.1' +'webdevops/php:7.4-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' + - 'cd docker/php-official/7.4-alpine' + - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_63a0a680af34d5.47006296' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af34d5.47006296' + - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_65675433b1f584.94664071' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f584.94664071' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWYzNGQ1LjQ3MDA2Mjk2In0= Dockerfile_63a0a680af34d5.47006296' - - 'docker push webdevops/php-apache-dev:7.4-alpine' - - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZjU4NC45NDY2NDA3MSJ9 Dockerfile_65675433b1f584.94664071' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' + - 'docker push webdevops/php:7.4-alpine' + - 'docker tag webdevops/php:7.4-alpine $CI_REGISTRY_IMAGE/php:7.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:7.4-alpine' + - 'docker tag webdevops/php:7.4-alpine webdevops/php-official:7.4-alpine' + - 'docker push webdevops/php-official:7.4-alpine' tags: - aws needs: - - 'webdevops/php-apache:7.4-alpine' + - 'webdevops/toolbox:latest' 'webdevops/php-nginx:7.4-alpine': stage: level3 before_script: @@ -468,10 +410,10 @@ stages: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_63a0a680af38d0.76710289' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af38d0.76710289' + - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_65675433b1f776.30188374' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f776.30188374' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmMzhkMC43NjcxMDI4OSJ9 Dockerfile_63a0a680af38d0.76710289' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZjc3Ni4zMDE4ODM3NCJ9 Dockerfile_65675433b1f776.30188374' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4-alpine' @@ -491,10 +433,10 @@ stages: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_63a0a680af3d58.70391939' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af3d58.70391939' + - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_65675433b1f966.71965536' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f966.71965536' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjNkNTguNzAzOTE5MzkifQ== Dockerfile_63a0a680af3d58.70391939' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWY5NjYuNzE5NjU1MzYifQ== Dockerfile_65675433b1f966.71965536' - 'docker push webdevops/php-nginx-dev:7.4-alpine' - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' @@ -512,10 +454,10 @@ stages: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_63a0a680af4137.64723119' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af4137.64723119' + - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_65675433b1fb19.81686340' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fb19.81686340' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjQxMzcuNjQ3MjMxMTkifQ== Dockerfile_63a0a680af4137.64723119' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWZiMTkuODE2ODYzNDAifQ== Dockerfile_65675433b1fb19.81686340' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4-alpine' @@ -525,542 +467,584 @@ stages: - aws needs: - 'webdevops/php:7.4-alpine' -'webdevops/php:7.4': - stage: level2 +'webdevops/php-apache:7.4-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/7.4' - - 'docker build --no-cache -t webdevops/php:7.4 .' + - 'cd docker/php-apache/7.4-alpine' + - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_63a0a680af7893.34652045' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af7893.34652045' + - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_65675433b1fcf4.64234489' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fcf4.64234489' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY3ODkzLjM0NjUyMDQ1In0= Dockerfile_63a0a680af7893.34652045' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - - 'docker push webdevops/php:7.4' - - 'docker tag webdevops/php:7.4 $CI_REGISTRY_IMAGE/php:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php:7.4' - - 'docker tag webdevops/php:7.4 webdevops/php-official:7.4' - - 'docker push webdevops/php-official:7.4' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWZjZjQuNjQyMzQ0ODkifQ== Dockerfile_65675433b1fcf4.64234489' + - 'docker push webdevops/php-apache:7.4-alpine' + - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-apache:7.4': - stage: level3 + - 'webdevops/php:7.4-alpine' +'webdevops/php-apache-dev:7.4-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/7.4' - - 'docker build --no-cache -t webdevops/php-apache:7.4 .' + - 'cd docker/php-apache-dev/7.4-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_63a0a680af7cf7.00346023' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af7cf7.00346023' + - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_65675433b1fed7.02958462' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fed7.02958462' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmN2NmNy4wMDM0NjAyMyJ9 Dockerfile_63a0a680af7cf7.00346023' - - 'docker push webdevops/php-apache:7.4' - - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFmZWQ3LjAyOTU4NDYyIn0= Dockerfile_65675433b1fed7.02958462' + - 'docker push webdevops/php-apache-dev:7.4-alpine' + - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php-apache-dev:7.4': - stage: level4 + - 'webdevops/php-apache:7.4-alpine' +'webdevops/php:8.1-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/7.4' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' + - 'cd docker/php-official/8.1-alpine' + - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_63a0a680af80e5.44626955' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af80e5.44626955' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65675433b21671.66543969' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21671.66543969' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjgwZTUuNDQ2MjY5NTUifQ== Dockerfile_63a0a680af80e5.44626955' - - 'docker push webdevops/php-apache-dev:7.4' - - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMTY3MS42NjU0Mzk2OSJ9 Dockerfile_65675433b21671.66543969' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' + - 'docker push webdevops/php-official:8.1-alpine' tags: - aws needs: - - 'webdevops/php-apache:7.4' -'webdevops/php-nginx:7.4': + - 'webdevops/toolbox:latest' +'webdevops/php-nginx:8.1-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/7.4' - - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' + - 'cd docker/php-nginx/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_63a0a680af8502.17422102' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8502.17422102' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65675433b21857.27678863' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21857.27678863' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY4NTAyLjE3NDIyMTAyIn0= Dockerfile_63a0a680af8502.17422102' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMTg1Ny4yNzY3ODg2MyJ9 Dockerfile_65675433b21857.27678863' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:7.4' - - 'docker tag webdevops/php-nginx:7.4 $CI_REGISTRY_IMAGE/php-nginx:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.4' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1-alpine' + - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php-nginx-dev:7.4': + - 'webdevops/php:8.1-alpine' +'webdevops/php-nginx-dev:8.1-alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/7.4' - - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' + - 'cd docker/php-nginx-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_63a0a680af8995.11217891' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8995.11217891' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65675433b21a33.15943363' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21a33.15943363' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmODk5NS4xMTIxNzg5MSJ9 Dockerfile_63a0a680af8995.11217891' - - 'docker push webdevops/php-nginx-dev:7.4' - - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFhMzMuMTU5NDMzNjMifQ== Dockerfile_65675433b21a33.15943363' + - 'docker push webdevops/php-nginx-dev:8.1-alpine' + - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php-nginx:7.4' -'webdevops/php-dev:7.4': + - 'webdevops/php-nginx:8.1-alpine' +'webdevops/php-dev:8.1-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/7.4' - - 'docker build --no-cache -t webdevops/php-dev:7.4 .' + - 'cd docker/php-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_63a0a680af8f30.54137318' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af8f30.54137318' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65675433b21be3.99665890' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21be3.99665890' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmOGYzMC41NDEzNzMxOCJ9 Dockerfile_63a0a680af8f30.54137318' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFiZTMuOTk2NjU4OTAifQ== Dockerfile_65675433b21be3.99665890' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:7.4' - - 'docker tag webdevops/php-dev:7.4 $CI_REGISTRY_IMAGE/php-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.4' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1-alpine' + - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php:8.2-alpine': - stage: level2 + - 'webdevops/php:8.1-alpine' +'webdevops/php-apache:8.1-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.2-alpine' - - 'docker build --no-cache -t webdevops/php:8.2-alpine .' + - 'cd docker/php-apache/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_63a0a680af9384.72177834' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af9384.72177834' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65675433b21df0.23174418' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21df0.23174418' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmOTM4NC43MjE3NzgzNCJ9 Dockerfile_63a0a680af9384.72177834' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' - - 'docker push webdevops/php-official:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFkZjAuMjMxNzQ0MTgifQ== Dockerfile_65675433b21df0.23174418' + - 'docker push webdevops/php-apache:8.1-alpine' + - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.2-alpine': - stage: level3 + - 'webdevops/php:8.1-alpine' +'webdevops/php-apache-dev:8.1-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' + - 'cd docker/php-apache-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_63a0a680af97a9.33200366' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af97a9.33200366' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65675433b21fc4.92765948' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b21fc4.92765948' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZjk3YTkuMzMyMDAzNjYifQ== Dockerfile_63a0a680af97a9.33200366' - - 'docker push webdevops/php-apache:8.2-alpine' - - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIxZmM0LjkyNzY1OTQ4In0= Dockerfile_65675433b21fc4.92765948' + - 'docker push webdevops/php-apache-dev:8.1-alpine' + - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-apache-dev:8.2-alpine': - stage: level4 + - 'webdevops/php-apache:8.1-alpine' +'webdevops/php:8.3-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' + - 'cd docker/php-official/8.3-alpine' + - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_63a0a680af9c50.58605272' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680af9c50.58605272' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65675433b22183.08384064' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22183.08384064' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYWY5YzUwLjU4NjA1MjcyIn0= Dockerfile_63a0a680af9c50.58605272' - - 'docker push webdevops/php-apache-dev:8.2-alpine' - - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMjE4My4wODM4NDA2NCJ9 Dockerfile_65675433b22183.08384064' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' + - 'docker push webdevops/php-official:8.3-alpine' tags: - aws needs: - - 'webdevops/php-apache:8.2-alpine' -'webdevops/php-nginx:8.2-alpine': + - 'webdevops/toolbox:latest' +'webdevops/php-nginx:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' + - 'cd docker/php-nginx/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_63a0a680afa068.84341269' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa068.84341269' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65675433b22381.07505964' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22381.07505964' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmYTA2OC44NDM0MTI2OSJ9 Dockerfile_63a0a680afa068.84341269' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMjM4MS4wNzUwNTk2NCJ9 Dockerfile_65675433b22381.07505964' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2-alpine' - - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3-alpine' + - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx-dev:8.2-alpine': - stage: level4 + - 'webdevops/php:8.3-alpine' +'webdevops/php-dev:8.3-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' + - 'cd docker/php-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_63a0a680afa4f1.40300894' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa4f1.40300894' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65675433b22572.19343384' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22572.19343384' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZmE0ZjEuNDAzMDA4OTQifQ== Dockerfile_63a0a680afa4f1.40300894' - - 'docker push webdevops/php-nginx-dev:8.2-alpine' - - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjI1NzIuMTkzNDMzODQifQ== Dockerfile_65675433b22572.19343384' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3-alpine' + - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-dev:8.2-alpine': + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' + - 'cd docker/php-apache/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_63a0a680afa8d4.08421132' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680afa8d4.08421132' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65675433b22758.53325068' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22758.53325068' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBhZmE4ZDQuMDg0MjExMzIifQ== Dockerfile_63a0a680afa8d4.08421132' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2-alpine' - - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjI3NTguNTMzMjUwNjgifQ== Dockerfile_65675433b22758.53325068' + - 'docker push webdevops/php-apache:8.3-alpine' + - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php:8.1-alpine': + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65675433b22931.64341061' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22931.64341061' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyOTMxLjY0MzQxMDYxIn0= Dockerfile_65675433b22931.64341061' + - 'docker push webdevops/php-apache-dev:8.3-alpine' + - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3-alpine' +'webdevops/php:8.0': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.1-alpine' - - 'docker build --no-cache -t webdevops/php:8.1-alpine .' + - 'cd docker/php-official/8.0' + - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_63a0a680affbc5.18976598' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680affbc5.18976598' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65675433b22af4.31714999' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22af4.31714999' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGFmZmJjNS4xODk3NjU5OCJ9 Dockerfile_63a0a680affbc5.18976598' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyYWY0LjMxNzE0OTk5In0= Dockerfile_65675433b22af4.31714999' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - - 'docker push webdevops/php-official:8.1-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' + - 'docker push webdevops/php:8.0' + - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php:8.0' + - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' + - 'docker push webdevops/php-official:8.0' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.1-alpine': +'webdevops/php-nginx:8.0': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' + - 'cd docker/php-nginx/8.0' + - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_63a0a680b000d8.20454323' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b000d8.20454323' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65675433b22ce8.20172055' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22ce8.20172055' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDAwZDguMjA0NTQzMjMifQ== Dockerfile_63a0a680b000d8.20454323' - - 'docker push webdevops/php-apache:8.1-alpine' - - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyY2U4LjIwMTcyMDU1In0= Dockerfile_65675433b22ce8.20172055' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.0' + - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' tags: - aws needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache-dev:8.1-alpine': + - 'webdevops/php:8.0' +'webdevops/php-nginx-dev:8.0': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' + - 'cd docker/php-nginx-dev/8.0' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_63a0a680b004e0.81849339' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b004e0.81849339' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65675433b22ec1.13595801' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b22ec1.13595801' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAwNGUwLjgxODQ5MzM5In0= Dockerfile_63a0a680b004e0.81849339' - - 'docker push webdevops/php-apache-dev:8.1-alpine' - - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMmVjMS4xMzU5NTgwMSJ9 Dockerfile_65675433b22ec1.13595801' + - 'docker push webdevops/php-nginx-dev:8.0' + - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' tags: - aws needs: - - 'webdevops/php-apache:8.1-alpine' -'webdevops/php-nginx:8.1-alpine': + - 'webdevops/php-nginx:8.0' +'webdevops/php-dev:8.0': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' + - 'cd docker/php-dev/8.0' + - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_63a0a680b008b8.08732537' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b008b8.08732537' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65675433b23599.91378454' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b23599.91378454' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMDhiOC4wODczMjUzNyJ9 Dockerfile_63a0a680b008b8.08732537' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMzU5OS45MTM3ODQ1NCJ9 Dockerfile_65675433b23599.91378454' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1-alpine' - - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.0' + - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' tags: - aws needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx-dev:8.1-alpine': - stage: level4 + - 'webdevops/php:8.0' +'webdevops/php-apache:8.0': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' + - 'cd docker/php-apache/8.0' + - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_63a0a680b00dc9.70917019' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b00dc9.70917019' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65675433b23780.60608470' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b23780.60608470' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDBkYzkuNzA5MTcwMTkifQ== Dockerfile_63a0a680b00dc9.70917019' - - 'docker push webdevops/php-nginx-dev:8.1-alpine' - - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMzc4MC42MDYwODQ3MCJ9 Dockerfile_65675433b23780.60608470' + - 'docker push webdevops/php-apache:8.0' + - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' tags: - aws needs: - - 'webdevops/php-nginx:8.1-alpine' -'webdevops/php-dev:8.1-alpine': - stage: level3 + - 'webdevops/php:8.0' +'webdevops/php-apache-dev:8.0': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' + - 'cd docker/php-apache-dev/8.0' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_63a0a680b011b3.31908800' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b011b3.31908800' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65675433b23948.86731415' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b23948.86731415' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDExYjMuMzE5MDg4MDAifQ== Dockerfile_63a0a680b011b3.31908800' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1-alpine' - - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjM5NDguODY3MzE0MTUifQ== Dockerfile_65675433b23948.86731415' + - 'docker push webdevops/php-apache-dev:8.0' + - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' tags: - aws needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php:8.2': + - 'webdevops/php-apache:8.0' +'webdevops/php:8.2-alpine': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.2' - - 'docker build --no-cache -t webdevops/php:8.2 .' + - 'cd docker/php-official/8.2-alpine' + - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_63a0a680b01626.11823495' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01626.11823495' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65675433b27207.27209539' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27207.27209539' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAxNjI2LjExODIzNDk1In0= Dockerfile_63a0a680b01626.11823495' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyNzIwNy4yNzIwOTUzOSJ9 Dockerfile_65675433b27207.27209539' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - - 'docker push webdevops/php:8.2' - - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - - 'docker push webdevops/php-official:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' + - 'docker push webdevops/php-official:8.2-alpine' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.2': +'webdevops/php-nginx:8.2-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.2' - - 'docker build --no-cache -t webdevops/php-apache:8.2 .' + - 'cd docker/php-nginx/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_63a0a680b01a99.22853407' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01a99.22853407' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65675433b273d6.29181251' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b273d6.29181251' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMWE5OS4yMjg1MzQwNyJ9 Dockerfile_63a0a680b01a99.22853407' - - 'docker push webdevops/php-apache:8.2' - - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyNzNkNi4yOTE4MTI1MSJ9 Dockerfile_65675433b273d6.29181251' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2-alpine' + - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-apache-dev:8.2': + - 'webdevops/php:8.2-alpine' +'webdevops/php-nginx-dev:8.3-alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.2' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_63a0a680b01f65.87790388' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b01f65.87790388' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65675433b27578.86444201' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27578.86444201' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDFmNjUuODc3OTAzODgifQ== Dockerfile_63a0a680b01f65.87790388' - - 'docker push webdevops/php-apache-dev:8.2' - - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc1NzguODY0NDQyMDEifQ== Dockerfile_65675433b27578.86444201' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php-apache:8.2' -'webdevops/php-nginx:8.2': + - 'webdevops/php-nginx:8.2-alpine' +'webdevops/php-nginx-dev:8.2-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65675433b276f3.62355567' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b276f3.62355567' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc2ZjMuNjIzNTU1NjcifQ== Dockerfile_65675433b276f3.62355567' + - 'docker push webdevops/php-nginx-dev:8.2-alpine' + - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.2-alpine' +'webdevops/php-dev:8.2-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2' - - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' + - 'cd docker/php-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_63a0a680b02368.32057091' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02368.32057091' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65675433b27871.99892458' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27871.99892458' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjAyMzY4LjMyMDU3MDkxIn0= Dockerfile_63a0a680b02368.32057091' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc4NzEuOTk4OTI0NTgifQ== Dockerfile_65675433b27871.99892458' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2' - - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2-alpine' + - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx-dev:8.2': - stage: level4 + - 'webdevops/php:8.2-alpine' +'webdevops/php-apache:8.2-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.2' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' + - 'cd docker/php-apache/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_63a0a680b02816.56160307' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02816.56160307' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65675433b27a39.71839167' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27a39.71839167' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMjgxNi41NjE2MDMwNyJ9 Dockerfile_63a0a680b02816.56160307' - - 'docker push webdevops/php-nginx-dev:8.2' - - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjdhMzkuNzE4MzkxNjcifQ== Dockerfile_65675433b27a39.71839167' + - 'docker push webdevops/php-apache:8.2-alpine' + - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.2' -'webdevops/php-dev:8.2': - stage: level3 + - 'webdevops/php:8.2-alpine' +'webdevops/php-apache-dev:8.2-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.2' - - 'docker build --no-cache -t webdevops/php-dev:8.2 .' + - 'cd docker/php-apache-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_63a0a680b02c37.21270440' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b02c37.21270440' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65675433b27bc6.84370643' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27bc6.84370643' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwMmMzNy4yMTI3MDQ0MCJ9 Dockerfile_63a0a680b02c37.21270440' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2' - - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI3YmM2Ljg0MzcwNjQzIn0= Dockerfile_65675433b27bc6.84370643' + - 'docker push webdevops/php-apache-dev:8.2-alpine' + - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' tags: - aws needs: - - 'webdevops/php:8.2' + - 'webdevops/php-apache:8.2-alpine' 'webdevops/php:8.0-alpine': stage: level2 before_script: @@ -1071,10 +1055,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_63a0a680b04d73.48817070' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b04d73.48817070' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65675433b27d59.35508780' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27d59.35508780' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwNGQ3My40ODgxNzA3MCJ9 Dockerfile_63a0a680b04d73.48817070' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyN2Q1OS4zNTUwODc4MCJ9 Dockerfile_65675433b27d59.35508780' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1086,23 +1070,90 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.0-alpine': +'webdevops/php-nginx:8.0-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' + - 'cd docker/php-nginx/8.0-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_63a0a680b05273.41383017' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b05273.41383017' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65675433b27f11.23185890' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b27f11.23185890' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDUyNzMuNDEzODMwMTcifQ== Dockerfile_63a0a680b05273.41383017' - - 'docker push webdevops/php-apache:8.0-alpine' - - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyN2YxMS4yMzE4NTg5MCJ9 Dockerfile_65675433b27f11.23185890' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.0-alpine' + - 'docker tag webdevops/php-nginx:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.0-alpine' +'webdevops/php-nginx-dev:8.0-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.0-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65675433b280b9.54599318' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b280b9.54599318' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgwYjkuNTQ1OTkzMTgifQ== Dockerfile_65675433b280b9.54599318' + - 'docker push webdevops/php-nginx-dev:8.0-alpine' + - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.0-alpine' +'webdevops/php-dev:8.0-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.0-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65675433b28238.37797639' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28238.37797639' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgyMzguMzc3OTc2MzkifQ== Dockerfile_65675433b28238.37797639' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.0-alpine' + - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.0-alpine' +'webdevops/php-apache:8.0-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.0-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65675433b283d5.63519875' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b283d5.63519875' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgzZDUuNjM1MTk4NzUifQ== Dockerfile_65675433b283d5.63519875' + - 'docker push webdevops/php-apache:8.0-alpine' + - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' tags: - aws needs: @@ -1117,10 +1168,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_63a0a680b056f8.44429817' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b056f8.44429817' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65675433b28549.48188188' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28549.48188188' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA1NmY4LjQ0NDI5ODE3In0= Dockerfile_63a0a680b056f8.44429817' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4NTQ5LjQ4MTg4MTg4In0= Dockerfile_65675433b28549.48188188' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1128,204 +1179,421 @@ stages: - aws needs: - 'webdevops/php-apache:8.0-alpine' -'webdevops/php-nginx:8.0-alpine': +'webdevops/php:8.3': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.3' + - 'docker build --no-cache -t webdevops/php:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65675433b286c1.19328489' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b286c1.19328489' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4NmMxLjE5MzI4NDg5In0= Dockerfile_65675433b286c1.19328489' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' + - 'docker push webdevops/php:8.3' + - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3' + - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' + - 'docker push webdevops/php-official:8.3' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-nginx:8.3': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' + - 'cd docker/php-nginx/8.3' + - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_63a0a680b05b72.09221218' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b05b72.09221218' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65675433b28873.95831739' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28873.95831739' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwNWI3Mi4wOTIyMTIxOCJ9 Dockerfile_63a0a680b05b72.09221218' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4ODczLjk1ODMxNzM5In0= Dockerfile_65675433b28873.95831739' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0-alpine' - - 'docker tag webdevops/php-nginx:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3' + - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' tags: - aws needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-nginx-dev:8.0-alpine': + - 'webdevops/php:8.3' +'webdevops/php-nginx-dev:8.3': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' + - 'cd docker/php-nginx-dev/8.3' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_63a0a680b06183.56794668' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b06183.56794668' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65675433b28a19.63887213' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28a19.63887213' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDYxODMuNTY3OTQ2NjgifQ== Dockerfile_63a0a680b06183.56794668' - - 'docker push webdevops/php-nginx-dev:8.0-alpine' - - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGExOS42Mzg4NzIxMyJ9 Dockerfile_65675433b28a19.63887213' + - 'docker push webdevops/php-nginx-dev:8.3' + - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' tags: - aws needs: - - 'webdevops/php-nginx:8.0-alpine' -'webdevops/php-dev:8.0-alpine': + - 'webdevops/php-nginx:8.3' +'webdevops/php-dev:8.3': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' + - 'cd docker/php-dev/8.3' + - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_63a0a680b06602.98375138' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b06602.98375138' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65675433b28b96.48789843' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28b96.48789843' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDY2MDIuOTgzNzUxMzgifQ== Dockerfile_63a0a680b06602.98375138' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGI5Ni40ODc4OTg0MyJ9 Dockerfile_65675433b28b96.48789843' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0-alpine' - - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3' + - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' tags: - aws needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php:8.0': + - 'webdevops/php:8.3' +'webdevops/php-apache:8.3': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.3' + - 'docker build --no-cache -t webdevops/php-apache:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65675433b28d42.61167510' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28d42.61167510' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGQ0Mi42MTE2NzUxMCJ9 Dockerfile_65675433b28d42.61167510' + - 'docker push webdevops/php-apache:8.3' + - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' + tags: + - aws + needs: + - 'webdevops/php:8.3' +'webdevops/php-apache-dev:8.3': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65675433b28ef2.94850647' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b28ef2.94850647' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjhlZjIuOTQ4NTA2NDcifQ== Dockerfile_65675433b28ef2.94850647' + - 'docker push webdevops/php-apache-dev:8.3' + - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3' +'webdevops/php:7.4': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.0' - - 'docker build --no-cache -t webdevops/php:8.0 .' + - 'cd docker/php-official/7.4' + - 'docker build --no-cache -t webdevops/php:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_63a0a680b08736.87757162' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b08736.87757162' + - 'echo "FROM webdevops/php:7.4" >> Dockerfile_65675433b29075.29400553' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29075.29400553' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA4NzM2Ljg3NzU3MTYyIn0= Dockerfile_63a0a680b08736.87757162' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5MDc1LjI5NDAwNTUzIn0= Dockerfile_65675433b29075.29400553' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - - 'docker push webdevops/php:8.0' - - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0' - - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' - - 'docker push webdevops/php-official:8.0' + - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' + - 'docker push webdevops/php:7.4' + - 'docker tag webdevops/php:7.4 $CI_REGISTRY_IMAGE/php:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php:7.4' + - 'docker tag webdevops/php:7.4 webdevops/php-official:7.4' + - 'docker push webdevops/php-official:7.4' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-apache:8.0': +'webdevops/php-nginx:7.4': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.0' - - 'docker build --no-cache -t webdevops/php-apache:8.0 .' + - 'cd docker/php-nginx/7.4' + - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_63a0a680b08c18.08247093' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b08c18.08247093' + - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_65675433b29222.78798766' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29222.78798766' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOGMxOC4wODI0NzA5MyJ9 Dockerfile_63a0a680b08c18.08247093' - - 'docker push webdevops/php-apache:8.0' - - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5MjIyLjc4Nzk4NzY2In0= Dockerfile_65675433b29222.78798766' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:7.4' + - 'docker tag webdevops/php-nginx:7.4 $CI_REGISTRY_IMAGE/php-nginx:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.4' tags: - aws needs: - - 'webdevops/php:8.0' -'webdevops/php-apache-dev:8.0': + - 'webdevops/php:7.4' +'webdevops/php-nginx-dev:7.4': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.0' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' + - 'cd docker/php-nginx-dev/7.4' + - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_63a0a680b09045.81770220' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09045.81770220' + - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_65675433b293d3.53227652' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b293d3.53227652' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjNhMGE2ODBiMDkwNDUuODE3NzAyMjAifQ== Dockerfile_63a0a680b09045.81770220' - - 'docker push webdevops/php-apache-dev:8.0' - - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTNkMy41MzIyNzY1MiJ9 Dockerfile_65675433b293d3.53227652' + - 'docker push webdevops/php-nginx-dev:7.4' + - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' tags: - aws needs: - - 'webdevops/php-apache:8.0' -'webdevops/php-nginx:8.0': + - 'webdevops/php-nginx:7.4' +'webdevops/php-dev:7.4': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.0' - - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' + - 'cd docker/php-dev/7.4' + - 'docker build --no-cache -t webdevops/php-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_63a0a680b09443.06654177' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09443.06654177' + - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_65675433b29552.78776476' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29552.78776476' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYzYTBhNjgwYjA5NDQzLjA2NjU0MTc3In0= Dockerfile_63a0a680b09443.06654177' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTU1Mi43ODc3NjQ3NiJ9 Dockerfile_65675433b29552.78776476' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0' - - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:7.4' + - 'docker tag webdevops/php-dev:7.4 $CI_REGISTRY_IMAGE/php-dev:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.4' tags: - aws needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx-dev:8.0': + - 'webdevops/php:7.4' +'webdevops/php-apache:7.4': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/7.4' + - 'docker build --no-cache -t webdevops/php-apache:7.4 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_65675433b296e9.37401553' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b296e9.37401553' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTZlOS4zNzQwMTU1MyJ9 Dockerfile_65675433b296e9.37401553' + - 'docker push webdevops/php-apache:7.4' + - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' + tags: + - aws + needs: + - 'webdevops/php:7.4' +'webdevops/php-apache-dev:7.4': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.0' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' + - 'cd docker/php-apache-dev/7.4' + - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_63a0a680b09b87.90945850' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09b87.90945850' + - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_65675433b29875.50169186' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29875.50169186' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOWI4Ny45MDk0NTg1MCJ9 Dockerfile_63a0a680b09b87.90945850' - - 'docker push webdevops/php-nginx-dev:8.0' - - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjk4NzUuNTAxNjkxODYifQ== Dockerfile_65675433b29875.50169186' + - 'docker push webdevops/php-apache-dev:7.4' + - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' tags: - aws needs: - - 'webdevops/php-nginx:8.0' -'webdevops/php-dev:8.0': + - 'webdevops/php-apache:7.4' +'webdevops/php:8.2': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.2' + - 'docker build --no-cache -t webdevops/php:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65675433b29a00.52082583' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29a00.52082583' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5YTAwLjUyMDgyNTgzIn0= Dockerfile_65675433b29a00.52082583' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' + - 'docker push webdevops/php:8.2' + - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2' + - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' + - 'docker push webdevops/php-official:8.2' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-nginx:8.2': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.0' - - 'docker build --no-cache -t webdevops/php-dev:8.0 .' + - 'cd docker/php-nginx/8.2' + - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_63a0a680b09fb2.02765004' - - 'echo "COPY conf/ /" >> Dockerfile_63a0a680b09fb2.02765004' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65675433b29bb1.03113241' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29bb1.03113241' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82M2EwYTY4MGIwOWZiMi4wMjc2NTAwNCJ9 Dockerfile_63a0a680b09fb2.02765004' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5YmIxLjAzMTEzMjQxIn0= Dockerfile_65675433b29bb1.03113241' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0' - - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2' + - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' tags: - aws needs: - - 'webdevops/php:8.0' + - 'webdevops/php:8.2' +'webdevops/php-nginx-dev:8.2': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.2' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65675433b29d56.26743745' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29d56.26743745' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOWQ1Ni4yNjc0Mzc0NSJ9 Dockerfile_65675433b29d56.26743745' + - 'docker push webdevops/php-nginx-dev:8.2' + - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.2' +'webdevops/php-dev:8.2': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.2' + - 'docker build --no-cache -t webdevops/php-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65675433b29ed6.34422641' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b29ed6.34422641' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOWVkNi4zNDQyMjY0MSJ9 Dockerfile_65675433b29ed6.34422641' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2' + - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php:8.2' +'webdevops/php-apache:8.2': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.2' + - 'docker build --no-cache -t webdevops/php-apache:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65675433b2a072.47543103' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b2a072.47543103' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyYTA3Mi40NzU0MzEwMyJ9 Dockerfile_65675433b2a072.47543103' + - 'docker push webdevops/php-apache:8.2' + - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' + tags: + - aws + needs: + - 'webdevops/php:8.2' +'webdevops/php-apache-dev:8.2': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.2' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65675433b2a1e7.11161392' + - 'echo "COPY conf/ /" >> Dockerfile_65675433b2a1e7.11161392' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMmExZTcuMTExNjEzOTIifQ== Dockerfile_65675433b2a1e7.11161392' + - 'docker push webdevops/php-apache-dev:8.2' + - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php-apache:8.2' +'webdevops/storage:latest': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/storage/latest' + - 'docker build --no-cache -t webdevops/storage:latest .' + - 'docker push webdevops/storage:latest' + - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' + - 'docker push $CI_REGISTRY_IMAGE/storage:latest' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' From ec957f17fdf6d88dac3c9fbf57fba1d63b617138 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 29 Nov 2023 16:55:19 +0100 Subject: [PATCH 28/63] fix 8.3 image specs --- .gitlab-ci.yml | 414 +++++++++++++++++++++++------------------------ conf/console.yml | 10 +- 2 files changed, 212 insertions(+), 212 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5c17c86e..300ac113e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65675433b1c613.70189558' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1c613.70189558' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65677b23e6c259.26525060' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c259.26525060' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWM2MTMuNzAxODk1NTgifQ== Dockerfile_65675433b1c613.70189558' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmMyNTkuMjY1MjUwNjAifQ== Dockerfile_65677b23e6c259.26525060' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -53,10 +53,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65675433b1c953.60291897' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1c953.60291897' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65677b23e6c552.17410451' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c552.17410451' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFjOTUzLjYwMjkxODk3In0= Dockerfile_65675433b1c953.60291897' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZjNTUyLjE3NDEwNDUxIn0= Dockerfile_65677b23e6c552.17410451' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -78,10 +78,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65675433b1cbb2.77709423' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1cbb2.77709423' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65677b23e6c787.65875403' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c787.65875403' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxY2JiMi43NzcwOTQyMyJ9 Dockerfile_65675433b1cbb2.77709423' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2Yzc4Ny42NTg3NTQwMyJ9 Dockerfile_65677b23e6c787.65875403' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -119,10 +119,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65675433b1d1e0.15406481' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d1e0.15406481' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65677b23e6cd99.95762797' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6cd99.95762797' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZDFlMC4xNTQwNjQ4MSJ9 Dockerfile_65675433b1d1e0.15406481' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2Y2Q5OS45NTc2Mjc5NyJ9 Dockerfile_65677b23e6cd99.95762797' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -140,10 +140,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65675433b1d4a8.01604611' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d4a8.01604611' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65677b23e6cf81.10900355' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6cf81.10900355' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkNGE4LjAxNjA0NjExIn0= Dockerfile_65675433b1d4a8.01604611' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZjZjgxLjEwOTAwMzU1In0= Dockerfile_65677b23e6cf81.10900355' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -163,10 +163,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65675433b1d6a6.87940769' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d6a6.87940769' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65677b23e6d184.41222584' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d184.41222584' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZDZhNi44Nzk0MDc2OSJ9 Dockerfile_65675433b1d6a6.87940769' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZDE4NC40MTIyMjU4NCJ9 Dockerfile_65677b23e6d184.41222584' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -186,10 +186,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65675433b1d832.87943911' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1d832.87943911' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65677b23e6d377.72003085' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d377.72003085' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWQ4MzIuODc5NDM5MTEifQ== Dockerfile_65675433b1d832.87943911' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmQzNzcuNzIwMDMwODUifQ== Dockerfile_65677b23e6d377.72003085' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -209,10 +209,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65675433b1da61.91194083' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1da61.91194083' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65677b23e6d575.66284535' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d575.66284535' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWRhNjEuOTExOTQwODMifQ== Dockerfile_65675433b1da61.91194083' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmQ1NzUuNjYyODQ1MzUifQ== Dockerfile_65677b23e6d575.66284535' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -230,10 +230,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65675433b1dc44.69319365' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1dc44.69319365' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65677b23e6d735.03258235' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d735.03258235' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkYzQ0LjY5MzE5MzY1In0= Dockerfile_65675433b1dc44.69319365' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkNzM1LjAzMjU4MjM1In0= Dockerfile_65677b23e6d735.03258235' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -251,10 +251,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65675433b1de49.34274472' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1de49.34274472' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65677b23e6d8f3.30092321' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d8f3.30092321' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFkZTQ5LjM0Mjc0NDcyIn0= Dockerfile_65675433b1de49.34274472' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkOGYzLjMwMDkyMzIxIn0= Dockerfile_65677b23e6d8f3.30092321' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -276,10 +276,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65675433b1e128.55411430' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e128.55411430' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65677b23e6daf0.69858044' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6daf0.69858044' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFlMTI4LjU1NDExNDMwIn0= Dockerfile_65675433b1e128.55411430' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkYWYwLjY5ODU4MDQ0In0= Dockerfile_65677b23e6daf0.69858044' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -299,10 +299,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65675433b1e318.02772426' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e318.02772426' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65677b23e6dcf9.06659290' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6dcf9.06659290' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTMxOC4wMjc3MjQyNiJ9 Dockerfile_65675433b1e318.02772426' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZGNmOS4wNjY1OTI5MCJ9 Dockerfile_65677b23e6dcf9.06659290' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -320,10 +320,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65675433b1e4b8.41123325' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e4b8.41123325' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65677b23e6dec5.43013696' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6dec5.43013696' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTRiOC40MTEyMzMyNSJ9 Dockerfile_65675433b1e4b8.41123325' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZGVjNS40MzAxMzY5NiJ9 Dockerfile_65677b23e6dec5.43013696' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -343,10 +343,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65675433b1e674.40989087' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e674.40989087' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65677b23e6e0b9.61070574' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6e0b9.61070574' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZTY3NC40MDk4OTA4NyJ9 Dockerfile_65675433b1e674.40989087' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZTBiOS42MTA3MDU3NCJ9 Dockerfile_65677b23e6e0b9.61070574' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -364,10 +364,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65675433b1e819.32667280' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1e819.32667280' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65677b23e6e276.12046313' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6e276.12046313' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWU4MTkuMzI2NjcyODAifQ== Dockerfile_65675433b1e819.32667280' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmUyNzYuMTIwNDYzMTMifQ== Dockerfile_65677b23e6e276.12046313' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -385,10 +385,10 @@ stages: - 'cd docker/php-official/7.4-alpine' - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_65675433b1f584.94664071' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f584.94664071' + - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_65677b23e6f215.27309005' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f215.27309005' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZjU4NC45NDY2NDA3MSJ9 Dockerfile_65675433b1f584.94664071' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZjIxNS4yNzMwOTAwNSJ9 Dockerfile_65677b23e6f215.27309005' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - 'docker push webdevops/php:7.4-alpine' @@ -410,10 +410,10 @@ stages: - 'cd docker/php-nginx/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_65675433b1f776.30188374' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f776.30188374' + - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_65677b23e6f3a5.95880141' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f3a5.95880141' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IxZjc3Ni4zMDE4ODM3NCJ9 Dockerfile_65675433b1f776.30188374' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZjNhNS45NTg4MDE0MSJ9 Dockerfile_65677b23e6f3a5.95880141' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4-alpine' @@ -433,10 +433,10 @@ stages: - 'cd docker/php-nginx-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_65675433b1f966.71965536' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1f966.71965536' + - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_65677b23e6f549.42405065' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f549.42405065' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWY5NjYuNzE5NjU1MzYifQ== Dockerfile_65675433b1f966.71965536' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY1NDkuNDI0MDUwNjUifQ== Dockerfile_65677b23e6f549.42405065' - 'docker push webdevops/php-nginx-dev:7.4-alpine' - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' @@ -454,10 +454,10 @@ stages: - 'cd docker/php-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_65675433b1fb19.81686340' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fb19.81686340' + - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_65677b23e6f6c9.31761318' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f6c9.31761318' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWZiMTkuODE2ODYzNDAifQ== Dockerfile_65675433b1fb19.81686340' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY2YzkuMzE3NjEzMTgifQ== Dockerfile_65677b23e6f6c9.31761318' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4-alpine' @@ -477,10 +477,10 @@ stages: - 'cd docker/php-apache/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_65675433b1fcf4.64234489' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fcf4.64234489' + - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_65677b23e6f850.96051196' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f850.96051196' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMWZjZjQuNjQyMzQ0ODkifQ== Dockerfile_65675433b1fcf4.64234489' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY4NTAuOTYwNTExOTYifQ== Dockerfile_65677b23e6f850.96051196' - 'docker push webdevops/php-apache:7.4-alpine' - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' @@ -498,10 +498,10 @@ stages: - 'cd docker/php-apache-dev/7.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_65675433b1fed7.02958462' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b1fed7.02958462' + - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_65677b23e6f9e4.96907608' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f9e4.96907608' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjFmZWQ3LjAyOTU4NDYyIn0= Dockerfile_65675433b1fed7.02958462' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZmOWU0Ljk2OTA3NjA4In0= Dockerfile_65677b23e6f9e4.96907608' - 'docker push webdevops/php-apache-dev:7.4-alpine' - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' @@ -519,10 +519,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65675433b21671.66543969' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21671.66543969' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65677b23e70f15.68263114' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e70f15.68263114' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMTY3MS42NjU0Mzk2OSJ9 Dockerfile_65675433b21671.66543969' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MGYxNS42ODI2MzExNCJ9 Dockerfile_65677b23e70f15.68263114' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -544,10 +544,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65675433b21857.27678863' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21857.27678863' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65677b23e710a8.23288515' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e710a8.23288515' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMTg1Ny4yNzY3ODg2MyJ9 Dockerfile_65675433b21857.27678863' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MTBhOC4yMzI4ODUxNSJ9 Dockerfile_65677b23e710a8.23288515' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -567,10 +567,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65675433b21a33.15943363' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21a33.15943363' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65677b23e71241.00406742' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71241.00406742' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFhMzMuMTU5NDMzNjMifQ== Dockerfile_65675433b21a33.15943363' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzEyNDEuMDA0MDY3NDIifQ== Dockerfile_65677b23e71241.00406742' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -588,10 +588,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65675433b21be3.99665890' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21be3.99665890' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65677b23e713b6.22511736' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e713b6.22511736' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFiZTMuOTk2NjU4OTAifQ== Dockerfile_65675433b21be3.99665890' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzEzYjYuMjI1MTE3MzYifQ== Dockerfile_65677b23e713b6.22511736' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -611,10 +611,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65675433b21df0.23174418' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21df0.23174418' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65677b23e71560.31633181' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71560.31633181' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjFkZjAuMjMxNzQ0MTgifQ== Dockerfile_65675433b21df0.23174418' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzE1NjAuMzE2MzMxODEifQ== Dockerfile_65677b23e71560.31633181' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -632,10 +632,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65675433b21fc4.92765948' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b21fc4.92765948' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65677b23e716e3.89220132' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e716e3.89220132' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIxZmM0LjkyNzY1OTQ4In0= Dockerfile_65675433b21fc4.92765948' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxNmUzLjg5MjIwMTMyIn0= Dockerfile_65677b23e716e3.89220132' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -653,10 +653,10 @@ stages: - 'cd docker/php-official/8.3-alpine' - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65675433b22183.08384064' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22183.08384064' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65677b23e71860.26103217' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71860.26103217' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMjE4My4wODM4NDA2NCJ9 Dockerfile_65675433b22183.08384064' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MTg2MC4yNjEwMzIxNyJ9 Dockerfile_65677b23e71860.26103217' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - 'docker push webdevops/php:8.3-alpine' @@ -678,10 +678,10 @@ stages: - 'cd docker/php-nginx/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65675433b22381.07505964' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22381.07505964' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65677b23e71a13.73750395' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71a13.73750395' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMjM4MS4wNzUwNTk2NCJ9 Dockerfile_65675433b22381.07505964' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MWExMy43Mzc1MDM5NSJ9 Dockerfile_65677b23e71a13.73750395' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3-alpine' @@ -701,10 +701,10 @@ stages: - 'cd docker/php-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65675433b22572.19343384' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22572.19343384' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65677b23e71b94.49438482' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71b94.49438482' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjI1NzIuMTkzNDMzODQifQ== Dockerfile_65675433b22572.19343384' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzFiOTQuNDk0Mzg0ODIifQ== Dockerfile_65677b23e71b94.49438482' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3-alpine' @@ -724,10 +724,10 @@ stages: - 'cd docker/php-apache/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65675433b22758.53325068' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22758.53325068' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65677b23e71d22.36892336' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71d22.36892336' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjI3NTguNTMzMjUwNjgifQ== Dockerfile_65675433b22758.53325068' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzFkMjIuMzY4OTIzMzYifQ== Dockerfile_65677b23e71d22.36892336' - 'docker push webdevops/php-apache:8.3-alpine' - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' @@ -745,10 +745,10 @@ stages: - 'cd docker/php-apache-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65675433b22931.64341061' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22931.64341061' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65677b23e71e95.46967213' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71e95.46967213' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyOTMxLjY0MzQxMDYxIn0= Dockerfile_65675433b22931.64341061' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxZTk1LjQ2OTY3MjEzIn0= Dockerfile_65677b23e71e95.46967213' - 'docker push webdevops/php-apache-dev:8.3-alpine' - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' @@ -766,10 +766,10 @@ stages: - 'cd docker/php-official/8.0' - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65675433b22af4.31714999' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22af4.31714999' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65677b23e71ff3.88695175' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71ff3.88695175' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyYWY0LjMxNzE0OTk5In0= Dockerfile_65675433b22af4.31714999' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxZmYzLjg4Njk1MTc1In0= Dockerfile_65677b23e71ff3.88695175' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - 'docker push webdevops/php:8.0' @@ -791,10 +791,10 @@ stages: - 'cd docker/php-nginx/8.0' - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65675433b22ce8.20172055' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22ce8.20172055' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65677b23e72189.35141561' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72189.35141561' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjIyY2U4LjIwMTcyMDU1In0= Dockerfile_65675433b22ce8.20172055' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcyMTg5LjM1MTQxNTYxIn0= Dockerfile_65677b23e72189.35141561' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0' @@ -814,10 +814,10 @@ stages: - 'cd docker/php-nginx-dev/8.0' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65675433b22ec1.13595801' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b22ec1.13595801' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65677b23e72312.31508370' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72312.31508370' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMmVjMS4xMzU5NTgwMSJ9 Dockerfile_65675433b22ec1.13595801' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjMxMi4zMTUwODM3MCJ9 Dockerfile_65677b23e72312.31508370' - 'docker push webdevops/php-nginx-dev:8.0' - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' @@ -835,10 +835,10 @@ stages: - 'cd docker/php-dev/8.0' - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65675433b23599.91378454' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b23599.91378454' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65677b23e72484.46060559' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72484.46060559' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMzU5OS45MTM3ODQ1NCJ9 Dockerfile_65675433b23599.91378454' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjQ4NC40NjA2MDU1OSJ9 Dockerfile_65677b23e72484.46060559' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0' @@ -858,10 +858,10 @@ stages: - 'cd docker/php-apache/8.0' - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65675433b23780.60608470' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b23780.60608470' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65677b23e72611.81425169' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72611.81425169' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyMzc4MC42MDYwODQ3MCJ9 Dockerfile_65675433b23780.60608470' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjYxMS44MTQyNTE2OSJ9 Dockerfile_65677b23e72611.81425169' - 'docker push webdevops/php-apache:8.0' - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' @@ -879,10 +879,10 @@ stages: - 'cd docker/php-apache-dev/8.0' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65675433b23948.86731415' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b23948.86731415' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65677b23e72784.00497428' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72784.00497428' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjM5NDguODY3MzE0MTUifQ== Dockerfile_65675433b23948.86731415' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzI3ODQuMDA0OTc0MjgifQ== Dockerfile_65677b23e72784.00497428' - 'docker push webdevops/php-apache-dev:8.0' - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' @@ -900,10 +900,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65675433b27207.27209539' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27207.27209539' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65677b23e75783.17157563' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75783.17157563' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyNzIwNy4yNzIwOTUzOSJ9 Dockerfile_65675433b27207.27209539' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NTc4My4xNzE1NzU2MyJ9 Dockerfile_65677b23e75783.17157563' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -925,10 +925,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65675433b273d6.29181251' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b273d6.29181251' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65677b23e75910.73069979' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75910.73069979' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyNzNkNi4yOTE4MTI1MSJ9 Dockerfile_65675433b273d6.29181251' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NTkxMC43MzA2OTk3OSJ9 Dockerfile_65677b23e75910.73069979' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -948,10 +948,10 @@ stages: - 'cd docker/php-nginx-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65675433b27578.86444201' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27578.86444201' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65677b23e75aa0.01798223' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75aa0.01798223' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc1NzguODY0NDQyMDEifQ== Dockerfile_65675433b27578.86444201' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVhYTAuMDE3OTgyMjMifQ== Dockerfile_65677b23e75aa0.01798223' - 'docker push webdevops/php-nginx-dev:8.3-alpine' - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' @@ -969,10 +969,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65675433b276f3.62355567' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b276f3.62355567' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65677b23e75c10.65191020' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75c10.65191020' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc2ZjMuNjIzNTU1NjcifQ== Dockerfile_65675433b276f3.62355567' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVjMTAuNjUxOTEwMjAifQ== Dockerfile_65677b23e75c10.65191020' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -990,10 +990,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65675433b27871.99892458' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27871.99892458' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65677b23e75d83.42823726' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75d83.42823726' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjc4NzEuOTk4OTI0NTgifQ== Dockerfile_65675433b27871.99892458' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVkODMuNDI4MjM3MjYifQ== Dockerfile_65677b23e75d83.42823726' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -1013,10 +1013,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65675433b27a39.71839167' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27a39.71839167' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65677b23e75f52.30815515' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75f52.30815515' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjdhMzkuNzE4MzkxNjcifQ== Dockerfile_65675433b27a39.71839167' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVmNTIuMzA4MTU1MTUifQ== Dockerfile_65677b23e75f52.30815515' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -1034,10 +1034,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65675433b27bc6.84370643' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27bc6.84370643' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65677b23e760d5.50458681' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e760d5.50458681' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI3YmM2Ljg0MzcwNjQzIn0= Dockerfile_65675433b27bc6.84370643' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2MGQ1LjUwNDU4NjgxIn0= Dockerfile_65677b23e760d5.50458681' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -1055,10 +1055,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65675433b27d59.35508780' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27d59.35508780' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65677b23e76267.14905847' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76267.14905847' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyN2Q1OS4zNTUwODc4MCJ9 Dockerfile_65675433b27d59.35508780' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NjI2Ny4xNDkwNTg0NyJ9 Dockerfile_65677b23e76267.14905847' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1080,10 +1080,10 @@ stages: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65675433b27f11.23185890' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b27f11.23185890' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65677b23e76407.55116146' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76407.55116146' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyN2YxMS4yMzE4NTg5MCJ9 Dockerfile_65675433b27f11.23185890' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NjQwNy41NTExNjE0NiJ9 Dockerfile_65677b23e76407.55116146' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0-alpine' @@ -1103,10 +1103,10 @@ stages: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65675433b280b9.54599318' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b280b9.54599318' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65677b23e76594.46949276' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76594.46949276' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgwYjkuNTQ1OTkzMTgifQ== Dockerfile_65675433b280b9.54599318' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY1OTQuNDY5NDkyNzYifQ== Dockerfile_65677b23e76594.46949276' - 'docker push webdevops/php-nginx-dev:8.0-alpine' - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' @@ -1124,10 +1124,10 @@ stages: - 'cd docker/php-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65675433b28238.37797639' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28238.37797639' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65677b23e76706.32606695' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76706.32606695' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgyMzguMzc3OTc2MzkifQ== Dockerfile_65675433b28238.37797639' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY3MDYuMzI2MDY2OTUifQ== Dockerfile_65677b23e76706.32606695' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.0-alpine' @@ -1147,10 +1147,10 @@ stages: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65675433b283d5.63519875' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b283d5.63519875' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65677b23e76893.16939386' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76893.16939386' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjgzZDUuNjM1MTk4NzUifQ== Dockerfile_65675433b283d5.63519875' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY4OTMuMTY5MzkzODYifQ== Dockerfile_65677b23e76893.16939386' - 'docker push webdevops/php-apache:8.0-alpine' - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' @@ -1168,10 +1168,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65675433b28549.48188188' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28549.48188188' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65677b23e76a48.00931548' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76a48.00931548' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4NTQ5LjQ4MTg4MTg4In0= Dockerfile_65675433b28549.48188188' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2YTQ4LjAwOTMxNTQ4In0= Dockerfile_65677b23e76a48.00931548' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1189,10 +1189,10 @@ stages: - 'cd docker/php-official/8.3' - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65675433b286c1.19328489' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b286c1.19328489' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65677b23e76bc3.43806470' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76bc3.43806470' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4NmMxLjE5MzI4NDg5In0= Dockerfile_65675433b286c1.19328489' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2YmMzLjQzODA2NDcwIn0= Dockerfile_65677b23e76bc3.43806470' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - 'docker push webdevops/php:8.3' @@ -1214,10 +1214,10 @@ stages: - 'cd docker/php-nginx/8.3' - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65675433b28873.95831739' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28873.95831739' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65677b23e76d50.45305752' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76d50.45305752' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI4ODczLjk1ODMxNzM5In0= Dockerfile_65675433b28873.95831739' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2ZDUwLjQ1MzA1NzUyIn0= Dockerfile_65677b23e76d50.45305752' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3' @@ -1237,10 +1237,10 @@ stages: - 'cd docker/php-nginx-dev/8.3' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65675433b28a19.63887213' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28a19.63887213' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65677b23e76ee6.59644674' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76ee6.59644674' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGExOS42Mzg4NzIxMyJ9 Dockerfile_65675433b28a19.63887213' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NmVlNi41OTY0NDY3NCJ9 Dockerfile_65677b23e76ee6.59644674' - 'docker push webdevops/php-nginx-dev:8.3' - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' @@ -1258,10 +1258,10 @@ stages: - 'cd docker/php-dev/8.3' - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65675433b28b96.48789843' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28b96.48789843' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65677b23e77056.09020184' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77056.09020184' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGI5Ni40ODc4OTg0MyJ9 Dockerfile_65675433b28b96.48789843' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NzA1Ni4wOTAyMDE4NCJ9 Dockerfile_65677b23e77056.09020184' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3' @@ -1281,10 +1281,10 @@ stages: - 'cd docker/php-apache/8.3' - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65675433b28d42.61167510' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28d42.61167510' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65677b23e771f8.35724032' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e771f8.35724032' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOGQ0Mi42MTE2NzUxMCJ9 Dockerfile_65675433b28d42.61167510' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NzFmOC4zNTcyNDAzMiJ9 Dockerfile_65677b23e771f8.35724032' - 'docker push webdevops/php-apache:8.3' - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' @@ -1302,10 +1302,10 @@ stages: - 'cd docker/php-apache-dev/8.3' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65675433b28ef2.94850647' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b28ef2.94850647' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65677b23e77390.32824419' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77390.32824419' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjhlZjIuOTQ4NTA2NDcifQ== Dockerfile_65675433b28ef2.94850647' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzczOTAuMzI4MjQ0MTkifQ== Dockerfile_65677b23e77390.32824419' - 'docker push webdevops/php-apache-dev:8.3' - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' @@ -1323,10 +1323,10 @@ stages: - 'cd docker/php-official/7.4' - 'docker build --no-cache -t webdevops/php:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_65675433b29075.29400553' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29075.29400553' + - 'echo "FROM webdevops/php:7.4" >> Dockerfile_65677b23e77506.29962173' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77506.29962173' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5MDc1LjI5NDAwNTUzIn0= Dockerfile_65675433b29075.29400553' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzc1MDYuMjk5NjIxNzMifQ== Dockerfile_65677b23e77506.29962173' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - 'docker push webdevops/php:7.4' @@ -1348,10 +1348,10 @@ stages: - 'cd docker/php-nginx/7.4' - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_65675433b29222.78798766' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29222.78798766' + - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_65677b23e77698.48530519' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77698.48530519' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5MjIyLjc4Nzk4NzY2In0= Dockerfile_65675433b29222.78798766' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzc2OTguNDg1MzA1MTkifQ== Dockerfile_65677b23e77698.48530519' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:7.4' @@ -1371,10 +1371,10 @@ stages: - 'cd docker/php-nginx-dev/7.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_65675433b293d3.53227652' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b293d3.53227652' + - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_65677b23e77816.12202993' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77816.12202993' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTNkMy41MzIyNzY1MiJ9 Dockerfile_65675433b293d3.53227652' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ODE2LjEyMjAyOTkzIn0= Dockerfile_65677b23e77816.12202993' - 'docker push webdevops/php-nginx-dev:7.4' - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' @@ -1392,10 +1392,10 @@ stages: - 'cd docker/php-dev/7.4' - 'docker build --no-cache -t webdevops/php-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_65675433b29552.78776476' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29552.78776476' + - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_65677b23e77988.98366370' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77988.98366370' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTU1Mi43ODc3NjQ3NiJ9 Dockerfile_65675433b29552.78776476' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3OTg4Ljk4MzY2MzcwIn0= Dockerfile_65677b23e77988.98366370' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:7.4' @@ -1415,10 +1415,10 @@ stages: - 'cd docker/php-apache/7.4' - 'docker build --no-cache -t webdevops/php-apache:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_65675433b296e9.37401553' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b296e9.37401553' + - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_65677b23e77b14.91732814' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77b14.91732814' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOTZlOS4zNzQwMTU1MyJ9 Dockerfile_65675433b296e9.37401553' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3YjE0LjkxNzMyODE0In0= Dockerfile_65677b23e77b14.91732814' - 'docker push webdevops/php-apache:7.4' - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' @@ -1436,10 +1436,10 @@ stages: - 'cd docker/php-apache-dev/7.4' - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_65675433b29875.50169186' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29875.50169186' + - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_65677b23e77ca4.72751423' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77ca4.72751423' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMjk4NzUuNTAxNjkxODYifQ== Dockerfile_65675433b29875.50169186' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3N2NhNC43Mjc1MTQyMyJ9 Dockerfile_65677b23e77ca4.72751423' - 'docker push webdevops/php-apache-dev:7.4' - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' @@ -1457,10 +1457,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65675433b29a00.52082583' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29a00.52082583' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65677b23e77e26.73064673' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77e26.73064673' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5YTAwLjUyMDgyNTgzIn0= Dockerfile_65675433b29a00.52082583' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ZTI2LjczMDY0NjczIn0= Dockerfile_65677b23e77e26.73064673' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -1482,10 +1482,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65675433b29bb1.03113241' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29bb1.03113241' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65677b23e77fd1.86944714' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77fd1.86944714' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc1NDMzYjI5YmIxLjAzMTEzMjQxIn0= Dockerfile_65675433b29bb1.03113241' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ZmQxLjg2OTQ0NzE0In0= Dockerfile_65677b23e77fd1.86944714' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -1505,10 +1505,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65675433b29d56.26743745' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29d56.26743745' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65677b23e78167.85451092' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e78167.85451092' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOWQ1Ni4yNjc0Mzc0NSJ9 Dockerfile_65675433b29d56.26743745' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODE2Ny44NTQ1MTA5MiJ9 Dockerfile_65677b23e78167.85451092' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -1526,10 +1526,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65675433b29ed6.34422641' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b29ed6.34422641' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65677b23e782d9.53822770' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e782d9.53822770' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyOWVkNi4zNDQyMjY0MSJ9 Dockerfile_65675433b29ed6.34422641' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODJkOS41MzgyMjc3MCJ9 Dockerfile_65677b23e782d9.53822770' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -1549,10 +1549,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65675433b2a072.47543103' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b2a072.47543103' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65677b23e78455.15837566' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e78455.15837566' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3NTQzM2IyYTA3Mi40NzU0MzEwMyJ9 Dockerfile_65675433b2a072.47543103' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODQ1NS4xNTgzNzU2NiJ9 Dockerfile_65677b23e78455.15837566' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -1570,10 +1570,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65675433b2a1e7.11161392' - - 'echo "COPY conf/ /" >> Dockerfile_65675433b2a1e7.11161392' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65677b23e785c0.88716046' + - 'echo "COPY conf/ /" >> Dockerfile_65677b23e785c0.88716046' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzU0MzNiMmExZTcuMTExNjEzOTIifQ== Dockerfile_65675433b2a1e7.11161392' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzg1YzAuODg3MTYwNDYifQ== Dockerfile_65677b23e785c0.88716046' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' diff --git a/conf/console.yml b/conf/console.yml index 870ee01af..807372d95 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,11 +43,11 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php:8:3$': - OS_FAMILY: 'debian' - OS_VERSION: '12' - PHP_OFFICIAL: '1' - 'php[^:]*:[0-9]': + 'php[^:]*:8.(0|1|2)': OS_FAMILY: 'debian' OS_VERSION: '10' PHP_OFFICIAL: '1' + 'php[^:]*:8.3': + OS_FAMILY: 'debian' + OS_VERSION: '12' + PHP_OFFICIAL: '1' \ No newline at end of file From 182b20b5be836d957c5df241b7db8751cbb8353e Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 29 Nov 2023 19:33:19 +0100 Subject: [PATCH 29/63] blacklist 7.4 --- ci/BLACKLIST | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/BLACKLIST b/ci/BLACKLIST index 431bea1d2..31c82c306 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -3,4 +3,5 @@ 7.1 7.2 7.3 +7.4 ssh From dd8d28f917c1f7b2eff965a909c6bb81e9896544 Mon Sep 17 00:00:00 2001 From: Alexander Grein Date: Wed, 3 Jan 2024 11:59:31 +0100 Subject: [PATCH 30/63] Update ioncube resource url --- .../php/general/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh b/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh +++ b/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." From ef77cefc0490a9502aca0b8a51c10be001a031b3 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Thu, 4 Jan 2024 12:06:57 +0100 Subject: [PATCH 31/63] fix: provision ioncube urls --- .../5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- .../8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh index 18a6a9e47..df40ec25e 100644 --- a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -2,7 +2,7 @@ echo "Installing ionCube loader" -DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" TMP_FILE="/tmp/ioncube_loaders.tar.gz" echo "Downloading ..." From 184fc7e2ec633e83d65e31cce92892ac7cb577db Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Thu, 4 Jan 2024 13:01:18 +0100 Subject: [PATCH 32/63] fix: php8.3 blackfire --- docker/php-apache-dev/5.6/Dockerfile | 2 +- docker/php-apache-dev/7.0/Dockerfile | 2 +- docker/php-apache-dev/7.1/Dockerfile | 2 +- docker/php-apache-dev/7.2/Dockerfile | 2 +- docker/php-apache-dev/7.3/Dockerfile | 2 +- docker/php-apache-dev/7.4/Dockerfile | 2 +- docker/php-apache-dev/8.0/Dockerfile | 2 +- docker/php-apache-dev/8.1/Dockerfile | 2 +- docker/php-apache-dev/8.2/Dockerfile | 2 +- docker/php-apache-dev/8.3/Dockerfile | 2 +- docker/php-dev/5.6/Dockerfile | 2 +- docker/php-dev/7.0/Dockerfile | 2 +- docker/php-dev/7.1/Dockerfile | 2 +- docker/php-dev/7.2/Dockerfile | 2 +- docker/php-dev/7.3/Dockerfile | 2 +- docker/php-dev/7.4/Dockerfile | 2 +- docker/php-dev/8.0/Dockerfile | 2 +- docker/php-dev/8.1/Dockerfile | 2 +- docker/php-dev/8.2/Dockerfile | 2 +- docker/php-dev/8.3/Dockerfile | 2 +- docker/php-nginx-dev/5.6/Dockerfile | 2 +- docker/php-nginx-dev/7.0/Dockerfile | 2 +- docker/php-nginx-dev/7.1/Dockerfile | 2 +- docker/php-nginx-dev/7.2/Dockerfile | 2 +- docker/php-nginx-dev/7.3/Dockerfile | 2 +- docker/php-nginx-dev/7.4/Dockerfile | 2 +- docker/php-nginx-dev/8.0/Dockerfile | 2 +- docker/php-nginx-dev/8.1/Dockerfile | 2 +- docker/php-nginx-dev/8.2/Dockerfile | 2 +- docker/php-nginx-dev/8.3/Dockerfile | 2 +- template/Dockerfile/images/php.jinja2 | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 0f5e9ee54..44de9a194 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 9c892d6df..636680b78 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 9213c8ad8..30b9940f2 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index c7b1552cc..7940bb2de 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 9f4b24b2a..8b26ff0ce 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index b30d783d8..b9aa2deea 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 7277601d3..81859cc64 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index 6d118bd97..060fb1027 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/8.2/Dockerfile b/docker/php-apache-dev/8.2/Dockerfile index 744f95562..a5a857d5c 100644 --- a/docker/php-apache-dev/8.2/Dockerfile +++ b/docker/php-apache-dev/8.2/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-apache-dev/8.3/Dockerfile b/docker/php-apache-dev/8.3/Dockerfile index 7f0229c9b..e17ae173d 100644 --- a/docker/php-apache-dev/8.3/Dockerfile +++ b/docker/php-apache-dev/8.3/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index a898438a8..d50fc9119 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 7d3295b42..50493be84 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 42d845f61..a61271bba 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index 9d5ce4a3b..3f314262b 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 5c53a4cfa..f979076ae 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index c104dbbfe..de0af30b1 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 338aca88e..8b5b7b7b1 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index e4d54a2a5..08f9fa287 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/8.2/Dockerfile b/docker/php-dev/8.2/Dockerfile index 8a150ce73..544e5acbe 100644 --- a/docker/php-dev/8.2/Dockerfile +++ b/docker/php-dev/8.2/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-dev/8.3/Dockerfile b/docker/php-dev/8.3/Dockerfile index 88fbc5333..02f9c1b41 100644 --- a/docker/php-dev/8.3/Dockerfile +++ b/docker/php-dev/8.3/Dockerfile @@ -9,7 +9,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 2e66059d1..f3ebc15a0 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index d2e934393..b8b261614 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 52749cecb..2d2fa13aa 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index 962b2840c..243e76c8d 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index d850f59c1..ea30f1500 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index f20cf4e3d..f4f2395e5 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index cf025157f..fb86aaae0 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index 5f215076e..b6af3a3d8 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/8.2/Dockerfile b/docker/php-nginx-dev/8.2/Dockerfile index 0445f5372..bc25ce35b 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile +++ b/docker/php-nginx-dev/8.2/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/docker/php-nginx-dev/8.3/Dockerfile b/docker/php-nginx-dev/8.3/Dockerfile index 110c2a3ee..64936aa2f 100644 --- a/docker/php-nginx-dev/8.3/Dockerfile +++ b/docker/php-nginx-dev/8.3/Dockerfile @@ -17,7 +17,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 9002455c1..2c4dd918a 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -389,7 +389,7 @@ {% macro officialDevelopment(role='', version='') -%} # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ From c3e1e18e1281f9b68c81e5794f718d08a6fe7c98 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Thu, 4 Jan 2024 13:03:30 +0100 Subject: [PATCH 33/63] ci: remove 7.4 --- .gitlab-ci.yml | 1614 ++++++++++++++++++++---------------------------- 1 file changed, 673 insertions(+), 941 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 300ac113e..5523585ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,117 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' tags: - aws +'webdevops/bootstrap:alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/bootstrap/alpine' + - 'docker build --no-cache -t webdevops/bootstrap:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65969e81a9fbe7.15220176' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fbe7.15220176' + - 'bundle install' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYTlmYmU3LjE1MjIwMTc2In0= Dockerfile_65969e81a9fbe7.15220176' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' + - 'docker push webdevops/bootstrap:alpine' + - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/base:alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base/alpine' + - 'docker build --no-cache -t webdevops/base:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65969e81a9fe36.86754873' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fe36.86754873' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWE5ZmUzNi44Njc1NDg3MyJ9 Dockerfile_65969e81a9fe36.86754873' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' + - 'docker push webdevops/base:alpine' + - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base:alpine' + tags: + - aws + needs: + - 'webdevops/bootstrap:alpine' +'webdevops/nginx:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/nginx/alpine' + - 'docker build --no-cache -t webdevops/nginx:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65969e81a9ffb3.78311157' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9ffb3.78311157' + - 'bundle install' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhOWZmYjMuNzgzMTExNTcifQ== Dockerfile_65969e81a9ffb3.78311157' + - 'docker push webdevops/nginx:alpine' + - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' + - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' +'webdevops/apache:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/apache/alpine' + - 'docker build --no-cache -t webdevops/apache:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65969e81aa0137.94179778' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0137.94179778' + - 'bundle install' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwMTM3Ljk0MTc5Nzc4In0= Dockerfile_65969e81aa0137.94179778' + - 'docker push webdevops/apache:alpine' + - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' + - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' +'webdevops/base-app:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base-app/alpine' + - 'docker build --no-cache -t webdevops/base-app:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65969e81aa0323.30434210' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0323.30434210' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTAzMjMuMzA0MzQyMTAifQ== Dockerfile_65969e81aa0323.30434210' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' + - 'docker push webdevops/base-app:alpine' + - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' 'webdevops/bootstrap:ubuntu-22.04': stage: level2 before_script: @@ -28,10 +139,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65677b23e6c259.26525060' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c259.26525060' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65969e81aa05b0.92099237' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa05b0.92099237' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmMyNTkuMjY1MjUwNjAifQ== Dockerfile_65677b23e6c259.26525060' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTA1YjAuOTIwOTkyMzcifQ== Dockerfile_65969e81aa05b0.92099237' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -53,10 +164,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65677b23e6c552.17410451' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c552.17410451' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65969e81aa0759.94045219' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0759.94045219' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZjNTUyLjE3NDEwNDUxIn0= Dockerfile_65677b23e6c552.17410451' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwNzU5Ljk0MDQ1MjE5In0= Dockerfile_65969e81aa0759.94045219' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -78,10 +189,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65677b23e6c787.65875403' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6c787.65875403' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65969e81aa08b7.18673792' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa08b7.18673792' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2Yzc4Ny42NTg3NTQwMyJ9 Dockerfile_65677b23e6c787.65875403' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMDhiNy4xODY3Mzc5MiJ9 Dockerfile_65969e81aa08b7.18673792' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -119,10 +230,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65677b23e6cd99.95762797' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6cd99.95762797' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65969e81aa0ea2.54872229' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0ea2.54872229' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2Y2Q5OS45NTc2Mjc5NyJ9 Dockerfile_65677b23e6cd99.95762797' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMGVhMi41NDg3MjIyOSJ9 Dockerfile_65969e81aa0ea2.54872229' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -130,766 +241,290 @@ stages: - aws needs: - 'webdevops/base:ubuntu-22.04' -'webdevops/bootstrap:alpine': +'webdevops/storage:latest': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/bootstrap/alpine' - - 'docker build --no-cache -t webdevops/bootstrap:alpine .' + - 'cd docker/storage/latest' + - 'docker build --no-cache -t webdevops/storage:latest .' + - 'docker push webdevops/storage:latest' + - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' + - 'docker push $CI_REGISTRY_IMAGE/storage:latest' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php:8.2': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.2' + - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65677b23e6cf81.10900355' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6cf81.10900355' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65969e81aa22e5.03607832' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa22e5.03607832' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZjZjgxLjEwOTAwMzU1In0= Dockerfile_65677b23e6cf81.10900355' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyMmU1LjAzNjA3ODMyIn0= Dockerfile_65969e81aa22e5.03607832' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - - 'docker push webdevops/bootstrap:alpine' - - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' + - 'docker push webdevops/php:8.2' + - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2' + - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' + - 'docker push webdevops/php-official:8.2' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/base:alpine': +'webdevops/php-dev:8.2': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base/alpine' - - 'docker build --no-cache -t webdevops/base:alpine .' + - 'cd docker/php-dev/8.2' + - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65677b23e6d184.41222584' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d184.41222584' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65969e81aa2474.20871582' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2474.20871582' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZDE4NC40MTIyMjU4NCJ9 Dockerfile_65677b23e6d184.41222584' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjQ3NC4yMDg3MTU4MiJ9 Dockerfile_65969e81aa2474.20871582' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - - 'docker push webdevops/base:alpine' - - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2' + - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' tags: - aws needs: - - 'webdevops/bootstrap:alpine' -'webdevops/base-app:alpine': - stage: level4 + - 'webdevops/php:8.2' +'webdevops/php-nginx:8.2': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base-app/alpine' - - 'docker build --no-cache -t webdevops/base-app:alpine .' + - 'cd docker/php-nginx/8.2' + - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65677b23e6d377.72003085' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d377.72003085' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65969e81aa25f1.32995116' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa25f1.32995116' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmQzNzcuNzIwMDMwODUifQ== Dockerfile_65677b23e6d377.72003085' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyNWYxLjMyOTk1MTE2In0= Dockerfile_65969e81aa25f1.32995116' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - - 'docker push webdevops/base-app:alpine' - - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2' + - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/nginx:alpine': + - 'webdevops/php:8.2' +'webdevops/php-nginx-dev:8.2': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/nginx/alpine' - - 'docker build --no-cache -t webdevops/nginx:alpine .' + - 'cd docker/php-nginx-dev/8.2' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65677b23e6d575.66284535' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d575.66284535' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65969e81aa2798.35883166' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2798.35883166' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmQ1NzUuNjYyODQ1MzUifQ== Dockerfile_65677b23e6d575.66284535' - - 'docker push webdevops/nginx:alpine' - - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjc5OC4zNTg4MzE2NiJ9 Dockerfile_65969e81aa2798.35883166' + - 'docker push webdevops/php-nginx-dev:8.2' + - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/apache:alpine': - stage: level4 + - 'webdevops/php-nginx:8.2' +'webdevops/php-apache:8.2': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/apache/alpine' - - 'docker build --no-cache -t webdevops/apache:alpine .' + - 'cd docker/php-apache/8.2' + - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65677b23e6d735.03258235' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d735.03258235' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65969e81aa28e3.42650509' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa28e3.42650509' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkNzM1LjAzMjU4MjM1In0= Dockerfile_65677b23e6d735.03258235' - - 'docker push webdevops/apache:alpine' - - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjhlMy40MjY1MDUwOSJ9 Dockerfile_65969e81aa28e3.42650509' + - 'docker push webdevops/php-apache:8.2' + - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/php:8.1': - stage: level2 + - 'webdevops/php:8.2' +'webdevops/php-apache-dev:8.2': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.1' - - 'docker build --no-cache -t webdevops/php:8.1 .' + - 'cd docker/php-apache-dev/8.2' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65677b23e6d8f3.30092321' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6d8f3.30092321' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65969e81aa2a56.91619924' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2a56.91619924' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkOGYzLjMwMDkyMzIxIn0= Dockerfile_65677b23e6d8f3.30092321' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - - 'docker push webdevops/php:8.1' - - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1' - - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' - - 'docker push webdevops/php-official:8.1' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTJhNTYuOTE2MTk5MjQifQ== Dockerfile_65969e81aa2a56.91619924' + - 'docker push webdevops/php-apache-dev:8.2' + - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.1': - stage: level3 + - 'webdevops/php-apache:8.2' +'webdevops/php:8.3': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.1' - - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' + - 'cd docker/php-official/8.3' + - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65677b23e6daf0.69858044' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6daf0.69858044' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65969e81aa2c00.96913904' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2c00.96913904' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZkYWYwLjY5ODU4MDQ0In0= Dockerfile_65677b23e6daf0.69858044' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyYzAwLjk2OTEzOTA0In0= Dockerfile_65969e81aa2c00.96913904' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1' - - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' + - 'docker push webdevops/php:8.3' + - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3' + - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' + - 'docker push webdevops/php-official:8.3' tags: - aws needs: - - 'webdevops/php:8.1' -'webdevops/php-nginx-dev:8.1': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.3': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.1' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' + - 'cd docker/php-dev/8.3' + - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65677b23e6dcf9.06659290' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6dcf9.06659290' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65969e81aa2dc5.21195258' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2dc5.21195258' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZGNmOS4wNjY1OTI5MCJ9 Dockerfile_65677b23e6dcf9.06659290' - - 'docker push webdevops/php-nginx-dev:8.1' - - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMmRjNS4yMTE5NTI1OCJ9 Dockerfile_65969e81aa2dc5.21195258' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3' + - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' tags: - aws needs: - - 'webdevops/php-nginx:8.1' -'webdevops/php-dev:8.1': + - 'webdevops/php:8.3' +'webdevops/php-nginx:8.3': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.1' - - 'docker build --no-cache -t webdevops/php-dev:8.1 .' + - 'cd docker/php-nginx/8.3' + - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65677b23e6dec5.43013696' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6dec5.43013696' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65969e81aa30f3.78486684' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa30f3.78486684' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZGVjNS40MzAxMzY5NiJ9 Dockerfile_65677b23e6dec5.43013696' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEzMGYzLjc4NDg2Njg0In0= Dockerfile_65969e81aa30f3.78486684' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1' - - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-apache:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1' - - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65677b23e6e0b9.61070574' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6e0b9.61070574' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZTBiOS42MTA3MDU3NCJ9 Dockerfile_65677b23e6e0b9.61070574' - - 'docker push webdevops/php-apache:8.1' - - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-apache-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65677b23e6e276.12046313' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6e276.12046313' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmUyNzYuMTIwNDYzMTMifQ== Dockerfile_65677b23e6e276.12046313' - - 'docker push webdevops/php-apache-dev:8.1' - - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php-apache:8.1' -'webdevops/php:7.4-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/7.4-alpine' - - 'docker build --no-cache -t webdevops/php:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4-alpine" >> Dockerfile_65677b23e6f215.27309005' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f215.27309005' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZjIxNS4yNzMwOTAwNSJ9 Dockerfile_65677b23e6f215.27309005' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4-alpine --config php/test.yaml' - - 'docker push webdevops/php:7.4-alpine' - - 'docker tag webdevops/php:7.4-alpine $CI_REGISTRY_IMAGE/php:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:7.4-alpine' - - 'docker tag webdevops/php:7.4-alpine webdevops/php-official:7.4-alpine' - - 'docker push webdevops/php-official:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:7.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4-alpine" >> Dockerfile_65677b23e6f3a5.95880141' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f3a5.95880141' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U2ZjNhNS45NTg4MDE0MSJ9 Dockerfile_65677b23e6f3a5.95880141' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:7.4-alpine' - - 'docker tag webdevops/php-nginx:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.4-alpine' -'webdevops/php-nginx-dev:7.4-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_65677b23e6f549.42405065' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f549.42405065' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY1NDkuNDI0MDUwNjUifQ== Dockerfile_65677b23e6f549.42405065' - - 'docker push webdevops/php-nginx-dev:7.4-alpine' - - 'docker tag webdevops/php-nginx-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:7.4-alpine' -'webdevops/php-dev:7.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-dev:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4-alpine" >> Dockerfile_65677b23e6f6c9.31761318' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f6c9.31761318' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY2YzkuMzE3NjEzMTgifQ== Dockerfile_65677b23e6f6c9.31761318' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:7.4-alpine' - - 'docker tag webdevops/php-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-dev:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.4-alpine' -'webdevops/php-apache:7.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4-alpine" >> Dockerfile_65677b23e6f850.96051196' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f850.96051196' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNmY4NTAuOTYwNTExOTYifQ== Dockerfile_65677b23e6f850.96051196' - - 'docker push webdevops/php-apache:7.4-alpine' - - 'docker tag webdevops/php-apache:7.4-alpine $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/php:7.4-alpine' -'webdevops/php-apache-dev:7.4-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/7.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_65677b23e6f9e4.96907608' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e6f9e4.96907608' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTZmOWU0Ljk2OTA3NjA4In0= Dockerfile_65677b23e6f9e4.96907608' - - 'docker push webdevops/php-apache-dev:7.4-alpine' - - 'docker tag webdevops/php-apache-dev:7.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:7.4-alpine' -'webdevops/php:8.1-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.1-alpine' - - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65677b23e70f15.68263114' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e70f15.68263114' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MGYxNS42ODI2MzExNCJ9 Dockerfile_65677b23e70f15.68263114' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - - 'docker push webdevops/php-official:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65677b23e710a8.23288515' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e710a8.23288515' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MTBhOC4yMzI4ODUxNSJ9 Dockerfile_65677b23e710a8.23288515' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1-alpine' - - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65677b23e71241.00406742' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71241.00406742' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzEyNDEuMDA0MDY3NDIifQ== Dockerfile_65677b23e71241.00406742' - - 'docker push webdevops/php-nginx-dev:8.1-alpine' - - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.1-alpine' -'webdevops/php-dev:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65677b23e713b6.22511736' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e713b6.22511736' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzEzYjYuMjI1MTE3MzYifQ== Dockerfile_65677b23e713b6.22511736' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1-alpine' - - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65677b23e71560.31633181' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71560.31633181' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzE1NjAuMzE2MzMxODEifQ== Dockerfile_65677b23e71560.31633181' - - 'docker push webdevops/php-apache:8.1-alpine' - - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65677b23e716e3.89220132' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e716e3.89220132' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxNmUzLjg5MjIwMTMyIn0= Dockerfile_65677b23e716e3.89220132' - - 'docker push webdevops/php-apache-dev:8.1-alpine' - - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.1-alpine' -'webdevops/php:8.3-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.3-alpine' - - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65677b23e71860.26103217' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71860.26103217' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MTg2MC4yNjEwMzIxNyJ9 Dockerfile_65677b23e71860.26103217' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' - - 'docker push webdevops/php-official:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65677b23e71a13.73750395' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71a13.73750395' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MWExMy43Mzc1MDM5NSJ9 Dockerfile_65677b23e71a13.73750395' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3-alpine' - - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-dev:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65677b23e71b94.49438482' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71b94.49438482' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzFiOTQuNDk0Mzg0ODIifQ== Dockerfile_65677b23e71b94.49438482' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3-alpine' - - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-apache:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65677b23e71d22.36892336' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71d22.36892336' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzFkMjIuMzY4OTIzMzYifQ== Dockerfile_65677b23e71d22.36892336' - - 'docker push webdevops/php-apache:8.3-alpine' - - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-apache-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65677b23e71e95.46967213' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71e95.46967213' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxZTk1LjQ2OTY3MjEzIn0= Dockerfile_65677b23e71e95.46967213' - - 'docker push webdevops/php-apache-dev:8.3-alpine' - - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.3-alpine' -'webdevops/php:8.0': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.0' - - 'docker build --no-cache -t webdevops/php:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65677b23e71ff3.88695175' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e71ff3.88695175' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcxZmYzLjg4Njk1MTc1In0= Dockerfile_65677b23e71ff3.88695175' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - - 'docker push webdevops/php:8.0' - - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0' - - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' - - 'docker push webdevops/php-official:8.0' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.0' - - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65677b23e72189.35141561' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72189.35141561' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTcyMTg5LjM1MTQxNTYxIn0= Dockerfile_65677b23e72189.35141561' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0' - - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx-dev:8.0': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.0' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65677b23e72312.31508370' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72312.31508370' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjMxMi4zMTUwODM3MCJ9 Dockerfile_65677b23e72312.31508370' - - 'docker push webdevops/php-nginx-dev:8.0' - - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3' + - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' tags: - aws needs: - - 'webdevops/php-nginx:8.0' -'webdevops/php-dev:8.0': - stage: level3 + - 'webdevops/php:8.3' +'webdevops/php-nginx-dev:8.3': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.0' - - 'docker build --no-cache -t webdevops/php-dev:8.0 .' + - 'cd docker/php-nginx-dev/8.3' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65677b23e72484.46060559' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72484.46060559' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65969e81aa32b7.36398353' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa32b7.36398353' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjQ4NC40NjA2MDU1OSJ9 Dockerfile_65677b23e72484.46060559' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0' - - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzJiNy4zNjM5ODM1MyJ9 Dockerfile_65969e81aa32b7.36398353' + - 'docker push webdevops/php-nginx-dev:8.3' + - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' tags: - aws needs: - - 'webdevops/php:8.0' -'webdevops/php-apache:8.0': + - 'webdevops/php-nginx:8.3' +'webdevops/php-apache:8.3': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.0' - - 'docker build --no-cache -t webdevops/php-apache:8.0 .' + - 'cd docker/php-apache/8.3' + - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65677b23e72611.81425169' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72611.81425169' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65969e81aa3413.33167586' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3413.33167586' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3MjYxMS44MTQyNTE2OSJ9 Dockerfile_65677b23e72611.81425169' - - 'docker push webdevops/php-apache:8.0' - - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzQxMy4zMzE2NzU4NiJ9 Dockerfile_65969e81aa3413.33167586' + - 'docker push webdevops/php-apache:8.3' + - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' tags: - aws needs: - - 'webdevops/php:8.0' -'webdevops/php-apache-dev:8.0': + - 'webdevops/php:8.3' +'webdevops/php-apache-dev:8.3': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.0' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' + - 'cd docker/php-apache-dev/8.3' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65677b23e72784.00497428' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e72784.00497428' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65969e81aa3595.03706036' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3595.03706036' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzI3ODQuMDA0OTc0MjgifQ== Dockerfile_65677b23e72784.00497428' - - 'docker push webdevops/php-apache-dev:8.0' - - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTM1OTUuMDM3MDYwMzYifQ== Dockerfile_65969e81aa3595.03706036' + - 'docker push webdevops/php-apache-dev:8.3' + - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' tags: - aws needs: - - 'webdevops/php-apache:8.0' + - 'webdevops/php-apache:8.3' 'webdevops/php:8.2-alpine': stage: level2 before_script: @@ -900,10 +535,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65677b23e75783.17157563' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75783.17157563' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65969e81aa4c48.63440216' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4c48.63440216' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NTc4My4xNzE1NzU2MyJ9 Dockerfile_65677b23e75783.17157563' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGM0OC42MzQ0MDIxNiJ9 Dockerfile_65969e81aa4c48.63440216' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -915,50 +550,52 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.2-alpine': +'webdevops/php-dev:8.2-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' + - 'cd docker/php-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65677b23e75910.73069979' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75910.73069979' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65969e81aa4de7.33195445' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4de7.33195445' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NTkxMC43MzA2OTk3OSJ9 Dockerfile_65677b23e75910.73069979' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTRkZTcuMzMxOTU0NDUifQ== Dockerfile_65969e81aa4de7.33195445' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2-alpine' - - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2-alpine' + - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' tags: - aws needs: - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx-dev:8.3-alpine': - stage: level4 +'webdevops/php-nginx:8.2-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd docker/php-nginx/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65677b23e75aa0.01798223' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75aa0.01798223' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65969e81aa4f93.58890182' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4f93.58890182' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVhYTAuMDE3OTgyMjMifQ== Dockerfile_65677b23e75aa0.01798223' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGY5My41ODg5MDE4MiJ9 Dockerfile_65969e81aa4f93.58890182' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2-alpine' + - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.2-alpine' + - 'webdevops/php:8.2-alpine' 'webdevops/php-nginx-dev:8.2-alpine': stage: level4 before_script: @@ -969,10 +606,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65677b23e75c10.65191020' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75c10.65191020' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65969e81aa5164.98447807' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5164.98447807' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVjMTAuNjUxOTEwMjAifQ== Dockerfile_65677b23e75c10.65191020' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUxNjQuOTg0NDc4MDcifQ== Dockerfile_65969e81aa5164.98447807' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -980,29 +617,27 @@ stages: - aws needs: - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-dev:8.2-alpine': - stage: level3 +'webdevops/php-nginx-dev:8.3-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65677b23e75d83.42823726' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75d83.42823726' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65969e81aa52c4.21199013' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa52c4.21199013' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVkODMuNDI4MjM3MjYifQ== Dockerfile_65677b23e75d83.42823726' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2-alpine' - - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUyYzQuMjExOTkwMTMifQ== Dockerfile_65969e81aa52c4.21199013' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.2-alpine' + - 'webdevops/php-nginx:8.2-alpine' 'webdevops/php-apache:8.2-alpine': stage: level3 before_script: @@ -1013,10 +648,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65677b23e75f52.30815515' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e75f52.30815515' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65969e81aa5416.86506770' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5416.86506770' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzVmNTIuMzA4MTU1MTUifQ== Dockerfile_65677b23e75f52.30815515' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTU0MTYuODY1MDY3NzAifQ== Dockerfile_65969e81aa5416.86506770' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -1034,10 +669,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65677b23e760d5.50458681' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e760d5.50458681' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65969e81aa5562.54359563' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5562.54359563' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2MGQ1LjUwNDU4NjgxIn0= Dockerfile_65677b23e760d5.50458681' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE1NTYyLjU0MzU5NTYzIn0= Dockerfile_65969e81aa5562.54359563' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -1055,10 +690,10 @@ stages: - 'cd docker/php-official/8.0-alpine' - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65677b23e76267.14905847' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76267.14905847' + - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65969e81aa7783.30504506' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7783.30504506' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NjI2Ny4xNDkwNTg0NyJ9 Dockerfile_65677b23e76267.14905847' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNzc4My4zMDUwNDUwNiJ9 Dockerfile_65969e81aa7783.30504506' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - 'docker push webdevops/php:8.0-alpine' @@ -1070,6 +705,29 @@ stages: - aws needs: - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.0-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.0-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65969e81aa7a03.16807747' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7a03.16807747' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdhMDMuMTY4MDc3NDcifQ== Dockerfile_65969e81aa7a03.16807747' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.0-alpine' + - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.0-alpine' 'webdevops/php-nginx:8.0-alpine': stage: level3 before_script: @@ -1080,10 +738,10 @@ stages: - 'cd docker/php-nginx/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65677b23e76407.55116146' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76407.55116146' + - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65969e81aa7be3.43250156' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7be3.43250156' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NjQwNy41NTExNjE0NiJ9 Dockerfile_65677b23e76407.55116146' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhN2JlMy40MzI1MDE1NiJ9 Dockerfile_65969e81aa7be3.43250156' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.0-alpine' @@ -1103,10 +761,10 @@ stages: - 'cd docker/php-nginx-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65677b23e76594.46949276' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76594.46949276' + - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65969e81aa7d86.66793645' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7d86.66793645' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY1OTQuNDY5NDkyNzYifQ== Dockerfile_65677b23e76594.46949276' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdkODYuNjY3OTM2NDUifQ== Dockerfile_65969e81aa7d86.66793645' - 'docker push webdevops/php-nginx-dev:8.0-alpine' - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' @@ -1114,29 +772,6 @@ stages: - aws needs: - 'webdevops/php-nginx:8.0-alpine' -'webdevops/php-dev:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65677b23e76706.32606695' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76706.32606695' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY3MDYuMzI2MDY2OTUifQ== Dockerfile_65677b23e76706.32606695' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0-alpine' - - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' 'webdevops/php-apache:8.0-alpine': stage: level3 before_script: @@ -1147,10 +782,10 @@ stages: - 'cd docker/php-apache/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65677b23e76893.16939386' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76893.16939386' + - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65969e81aa7f81.41127162' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7f81.41127162' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzY4OTMuMTY5MzkzODYifQ== Dockerfile_65677b23e76893.16939386' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdmODEuNDExMjcxNjIifQ== Dockerfile_65969e81aa7f81.41127162' - 'docker push webdevops/php-apache:8.0-alpine' - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' @@ -1168,10 +803,10 @@ stages: - 'cd docker/php-apache-dev/8.0-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65677b23e76a48.00931548' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76a48.00931548' + - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65969e81aa80f5.58702224' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa80f5.58702224' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2YTQ4LjAwOTMxNTQ4In0= Dockerfile_65677b23e76a48.00931548' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4MGY1LjU4NzAyMjI0In0= Dockerfile_65969e81aa80f5.58702224' - 'docker push webdevops/php-apache-dev:8.0-alpine' - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' @@ -1179,421 +814,518 @@ stages: - aws needs: - 'webdevops/php-apache:8.0-alpine' -'webdevops/php:8.3': +'webdevops/php:8.1-alpine': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.3' - - 'docker build --no-cache -t webdevops/php:8.3 .' + - 'cd docker/php-official/8.1-alpine' + - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65677b23e76bc3.43806470' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76bc3.43806470' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65969e81aa8276.62506533' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8276.62506533' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2YmMzLjQzODA2NDcwIn0= Dockerfile_65677b23e76bc3.43806470' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODI3Ni42MjUwNjUzMyJ9 Dockerfile_65969e81aa8276.62506533' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - - 'docker push webdevops/php:8.3' - - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3' - - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' - - 'docker push webdevops/php-official:8.3' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' + - 'docker push webdevops/php-official:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65969e81aa8427.09198127' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8427.09198127' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg0MjcuMDkxOTgxMjcifQ== Dockerfile_65969e81aa8427.09198127' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1-alpine' + - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-nginx:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65969e81aa8605.38624016' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8605.38624016' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODYwNS4zODYyNDAxNiJ9 Dockerfile_65969e81aa8605.38624016' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1-alpine' + - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-nginx-dev:8.1-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65969e81aa87a7.17178267' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa87a7.17178267' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg3YTcuMTcxNzgyNjcifQ== Dockerfile_65969e81aa87a7.17178267' + - 'docker push webdevops/php-nginx-dev:8.1-alpine' + - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.1-alpine' +'webdevops/php-apache:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65969e81aa8921.55210754' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8921.55210754' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg5MjEuNTUyMTA3NTQifQ== Dockerfile_65969e81aa8921.55210754' + - 'docker push webdevops/php-apache:8.1-alpine' + - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-apache-dev:8.1-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65969e81aa8ac9.88472855' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8ac9.88472855' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4YWM5Ljg4NDcyODU1In0= Dockerfile_65969e81aa8ac9.88472855' + - 'docker push webdevops/php-apache-dev:8.1-alpine' + - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.3': - stage: level3 + - 'webdevops/php-apache:8.1-alpine' +'webdevops/php:8.3-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.3' - - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' + - 'cd docker/php-official/8.3-alpine' + - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65677b23e76d50.45305752' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76d50.45305752' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65969e81aaa4e7.42601644' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa4e7.42601644' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc2ZDUwLjQ1MzA1NzUyIn0= Dockerfile_65677b23e76d50.45305752' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYTRlNy40MjYwMTY0NCJ9 Dockerfile_65969e81aaa4e7.42601644' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3' - - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' + - 'docker push webdevops/php-official:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx-dev:8.3': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.3-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.3' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' + - 'cd docker/php-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65677b23e76ee6.59644674' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e76ee6.59644674' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65969e81aaa7f8.89428890' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa7f8.89428890' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NmVlNi41OTY0NDY3NCJ9 Dockerfile_65677b23e76ee6.59644674' - - 'docker push webdevops/php-nginx-dev:8.3' - - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWE3ZjguODk0Mjg4OTAifQ== Dockerfile_65969e81aaa7f8.89428890' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3-alpine' + - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.3' -'webdevops/php-dev:8.3': + - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.3' - - 'docker build --no-cache -t webdevops/php-dev:8.3 .' + - 'cd docker/php-nginx/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65677b23e77056.09020184' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77056.09020184' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65969e81aaab30.24147828' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaab30.24147828' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NzA1Ni4wOTAyMDE4NCJ9 Dockerfile_65677b23e77056.09020184' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYWIzMC4yNDE0NzgyOCJ9 Dockerfile_65969e81aaab30.24147828' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3' - - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3-alpine' + - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-apache:8.3': + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.3' - - 'docker build --no-cache -t webdevops/php-apache:8.3 .' + - 'cd docker/php-apache/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65677b23e771f8.35724032' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e771f8.35724032' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65969e81aaaf12.92675578' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaaf12.92675578' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3NzFmOC4zNTcyNDAzMiJ9 Dockerfile_65677b23e771f8.35724032' - - 'docker push webdevops/php-apache:8.3' - - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWFmMTIuOTI2NzU1NzgifQ== Dockerfile_65969e81aaaf12.92675578' + - 'docker push webdevops/php-apache:8.3-alpine' + - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-apache-dev:8.3': + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache-dev:8.3-alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.3' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' + - 'cd docker/php-apache-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65677b23e77390.32824419' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77390.32824419' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65969e81aab221.09271346' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab221.09271346' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzczOTAuMzI4MjQ0MTkifQ== Dockerfile_65677b23e77390.32824419' - - 'docker push webdevops/php-apache-dev:8.3' - - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiMjIxLjA5MjcxMzQ2In0= Dockerfile_65969e81aab221.09271346' + - 'docker push webdevops/php-apache-dev:8.3-alpine' + - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php-apache:8.3' -'webdevops/php:7.4': + - 'webdevops/php-apache:8.3-alpine' +'webdevops/php:8.1': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/7.4' - - 'docker build --no-cache -t webdevops/php:7.4 .' + - 'cd docker/php-official/8.1' + - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_65677b23e77506.29962173' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77506.29962173' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65969e81aab589.41021901' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab589.41021901' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzc1MDYuMjk5NjIxNzMifQ== Dockerfile_65677b23e77506.29962173' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiNTg5LjQxMDIxOTAxIn0= Dockerfile_65969e81aab589.41021901' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:7.4 --config php/test.yaml' - - 'docker push webdevops/php:7.4' - - 'docker tag webdevops/php:7.4 $CI_REGISTRY_IMAGE/php:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php:7.4' - - 'docker tag webdevops/php:7.4 webdevops/php-official:7.4' - - 'docker push webdevops/php-official:7.4' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' + - 'docker push webdevops/php:8.1' + - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1' + - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' + - 'docker push webdevops/php-official:8.1' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-nginx:7.4': +'webdevops/php-dev:8.1': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/7.4' - - 'docker build --no-cache -t webdevops/php-nginx:7.4 .' + - 'cd docker/php-dev/8.1' + - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:7.4" >> Dockerfile_65677b23e77698.48530519' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77698.48530519' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65969e81aab8d8.02649728' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab8d8.02649728' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzc2OTguNDg1MzA1MTkifQ== Dockerfile_65677b23e77698.48530519' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYjhkOC4wMjY0OTcyOCJ9 Dockerfile_65969e81aab8d8.02649728' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:7.4 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:7.4' - - 'docker tag webdevops/php-nginx:7.4 $CI_REGISTRY_IMAGE/php-nginx:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:7.4' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1' + - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php-nginx-dev:7.4': - stage: level4 + - 'webdevops/php:8.1' +'webdevops/php-nginx:8.1': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/7.4' - - 'docker build --no-cache -t webdevops/php-nginx-dev:7.4 .' + - 'cd docker/php-nginx/8.1' + - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4" >> Dockerfile_65677b23e77816.12202993' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77816.12202993' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65969e81aabc30.36776190' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabc30.36776190' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ODE2LjEyMjAyOTkzIn0= Dockerfile_65677b23e77816.12202993' - - 'docker push webdevops/php-nginx-dev:7.4' - - 'docker tag webdevops/php-nginx-dev:7.4 $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:7.4' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiYzMwLjM2Nzc2MTkwIn0= Dockerfile_65969e81aabc30.36776190' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1' + - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' tags: - aws needs: - - 'webdevops/php-nginx:7.4' -'webdevops/php-dev:7.4': - stage: level3 + - 'webdevops/php:8.1' +'webdevops/php-nginx-dev:8.1': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/7.4' - - 'docker build --no-cache -t webdevops/php-dev:7.4 .' + - 'cd docker/php-nginx-dev/8.1' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_65677b23e77988.98366370' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77988.98366370' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65969e81aabea0.64919119' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabea0.64919119' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3OTg4Ljk4MzY2MzcwIn0= Dockerfile_65677b23e77988.98366370' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:7.4 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:7.4' - - 'docker tag webdevops/php-dev:7.4 $CI_REGISTRY_IMAGE/php-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:7.4' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYmVhMC42NDkxOTExOSJ9 Dockerfile_65969e81aabea0.64919119' + - 'docker push webdevops/php-nginx-dev:8.1' + - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php-apache:7.4': + - 'webdevops/php-nginx:8.1' +'webdevops/php-apache:8.1': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/7.4' - - 'docker build --no-cache -t webdevops/php-apache:7.4 .' + - 'cd docker/php-apache/8.1' + - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:7.4" >> Dockerfile_65677b23e77b14.91732814' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77b14.91732814' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65969e81aac041.54500485' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac041.54500485' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3YjE0LjkxNzMyODE0In0= Dockerfile_65677b23e77b14.91732814' - - 'docker push webdevops/php-apache:7.4' - - 'docker tag webdevops/php-apache:7.4 $CI_REGISTRY_IMAGE/php-apache:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:7.4' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzA0MS41NDUwMDQ4NSJ9 Dockerfile_65969e81aac041.54500485' + - 'docker push webdevops/php-apache:8.1' + - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' tags: - aws needs: - - 'webdevops/php:7.4' -'webdevops/php-apache-dev:7.4': + - 'webdevops/php:8.1' +'webdevops/php-apache-dev:8.1': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/7.4' - - 'docker build --no-cache -t webdevops/php-apache-dev:7.4 .' + - 'cd docker/php-apache-dev/8.1' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4" >> Dockerfile_65677b23e77ca4.72751423' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77ca4.72751423' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65969e81aac277.34648619' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac277.34648619' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3N2NhNC43Mjc1MTQyMyJ9 Dockerfile_65677b23e77ca4.72751423' - - 'docker push webdevops/php-apache-dev:7.4' - - 'docker tag webdevops/php-apache-dev:7.4 $CI_REGISTRY_IMAGE/php-apache-dev:7.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:7.4' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWMyNzcuMzQ2NDg2MTkifQ== Dockerfile_65969e81aac277.34648619' + - 'docker push webdevops/php-apache-dev:8.1' + - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' tags: - aws needs: - - 'webdevops/php-apache:7.4' -'webdevops/php:8.2': + - 'webdevops/php-apache:8.1' +'webdevops/php:8.0': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.2' - - 'docker build --no-cache -t webdevops/php:8.2 .' + - 'cd docker/php-official/8.0' + - 'docker build --no-cache -t webdevops/php:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65677b23e77e26.73064673' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77e26.73064673' + - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65969e81aac4f1.09200919' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac4f1.09200919' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ZTI2LjczMDY0NjczIn0= Dockerfile_65677b23e77e26.73064673' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjNGYxLjA5MjAwOTE5In0= Dockerfile_65969e81aac4f1.09200919' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - - 'docker push webdevops/php:8.2' - - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - - 'docker push webdevops/php-official:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' + - 'docker push webdevops/php:8.0' + - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php:8.0' + - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' + - 'docker push webdevops/php-official:8.0' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php-nginx:8.2': +'webdevops/php-dev:8.0': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2' - - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' + - 'cd docker/php-dev/8.0' + - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65677b23e77fd1.86944714' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e77fd1.86944714' + - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65969e81aac786.86881703' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac786.86881703' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1Njc3YjIzZTc3ZmQxLjg2OTQ0NzE0In0= Dockerfile_65677b23e77fd1.86944714' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzc4Ni44Njg4MTcwMyJ9 Dockerfile_65969e81aac786.86881703' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2' - - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.0' + - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx-dev:8.2': - stage: level4 + - 'webdevops/php:8.0' +'webdevops/php-nginx:8.0': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.2' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' + - 'cd docker/php-nginx/8.0' + - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65677b23e78167.85451092' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e78167.85451092' + - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65969e81aac9c1.86208219' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac9c1.86208219' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODE2Ny44NTQ1MTA5MiJ9 Dockerfile_65677b23e78167.85451092' - - 'docker push webdevops/php-nginx-dev:8.2' - - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjOWMxLjg2MjA4MjE5In0= Dockerfile_65969e81aac9c1.86208219' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.0' + - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' tags: - aws needs: - - 'webdevops/php-nginx:8.2' -'webdevops/php-dev:8.2': - stage: level3 + - 'webdevops/php:8.0' +'webdevops/php-nginx-dev:8.0': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.2' - - 'docker build --no-cache -t webdevops/php-dev:8.2 .' + - 'cd docker/php-nginx-dev/8.0' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65677b23e782d9.53822770' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e782d9.53822770' + - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65969e81aacd19.15906247' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacd19.15906247' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODJkOS41MzgyMjc3MCJ9 Dockerfile_65677b23e782d9.53822770' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2' - - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2QxOS4xNTkwNjI0NyJ9 Dockerfile_65969e81aacd19.15906247' + - 'docker push webdevops/php-nginx-dev:8.0' + - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-apache:8.2': + - 'webdevops/php-nginx:8.0' +'webdevops/php-apache:8.0': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.2' - - 'docker build --no-cache -t webdevops/php-apache:8.2 .' + - 'cd docker/php-apache/8.0' + - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65677b23e78455.15837566' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e78455.15837566' + - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65969e81aacf95.68202676' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacf95.68202676' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTY3N2IyM2U3ODQ1NS4xNTgzNzU2NiJ9 Dockerfile_65677b23e78455.15837566' - - 'docker push webdevops/php-apache:8.2' - - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2Y5NS42ODIwMjY3NiJ9 Dockerfile_65969e81aacf95.68202676' + - 'docker push webdevops/php-apache:8.0' + - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-apache-dev:8.2': + - 'webdevops/php:8.0' +'webdevops/php-apache-dev:8.0': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.2' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd docker/php-apache-dev/8.0' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65677b23e785c0.88716046' - - 'echo "COPY conf/ /" >> Dockerfile_65677b23e785c0.88716046' + - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65969e81aad196.17719885' + - 'echo "COPY conf/ /" >> Dockerfile_65969e81aad196.17719885' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU2NzdiMjNlNzg1YzAuODg3MTYwNDYifQ== Dockerfile_65677b23e785c0.88716046' - - 'docker push webdevops/php-apache-dev:8.2' - - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - tags: - - aws - needs: - - 'webdevops/php-apache:8.2' -'webdevops/storage:latest': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/storage/latest' - - 'docker build --no-cache -t webdevops/storage:latest .' - - 'docker push webdevops/storage:latest' - - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' - - 'docker push $CI_REGISTRY_IMAGE/storage:latest' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWQxOTYuMTc3MTk4ODUifQ== Dockerfile_65969e81aad196.17719885' + - 'docker push webdevops/php-apache-dev:8.0' + - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' tags: - aws needs: - - 'webdevops/toolbox:latest' + - 'webdevops/php-apache:8.0' From 4f8fc7eade862d731446c1c8c0bb86e7df995ed0 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sun, 4 Feb 2024 18:14:52 +0100 Subject: [PATCH 34/63] fix php8.3-alpine --- docker/php-nginx-dev/8.3-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile index d7867c77d..4a53467f1 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.2-alpine +FROM webdevops/php-nginx:8.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 index e2a5982ff..6c039d628 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.2-alpine") }} +{{ docker.from("php-nginx", "8.3-alpine") }} {{ environment.web() }} {{ environment.webPhp() }} From b99a591f65bd75a122da23f0fa23b13e2c4a016c Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 7 Feb 2024 12:35:04 +0100 Subject: [PATCH 35/63] fix: ftp module missing in alpine --- template/Dockerfile/images/php.jinja2 | 1 + 1 file changed, 1 insertion(+) diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 2c4dd918a..cee9410c1 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -270,6 +270,7 @@ bz2 \ calendar \ exif \ + ftp \ gmp \ {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} ffi \ From e4ed788eccb348722fb9e679f861736bc3c5d934 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Mon, 12 Feb 2024 11:42:49 +0100 Subject: [PATCH 36/63] fix: missing ftp module on alpine --- docker/php-official/7.1-alpine/Dockerfile | 1 + docker/php-official/7.2-alpine/Dockerfile | 1 + docker/php-official/7.3-alpine/Dockerfile | 1 + docker/php-official/7.4-alpine/Dockerfile | 1 + docker/php-official/8.0-alpine/Dockerfile | 1 + docker/php-official/8.1-alpine/Dockerfile | 1 + docker/php-official/8.2-alpine/Dockerfile | 1 + docker/php-official/8.3-alpine/Dockerfile | 1 + 8 files changed, 8 insertions(+) diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 3ae5527cf..92d1e74ad 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -154,6 +154,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index e8fbb75ab..6c0a8891e 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -154,6 +154,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index db2860589..0db11ca34 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -154,6 +154,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 24fd9c8c4..0c3537634 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -157,6 +157,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ ffi \ imagick \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 9ee163a27..adaf7cd2c 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -157,6 +157,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ ffi \ imagick \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index bbd2c97d6..af79b0266 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -157,6 +157,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ ffi \ imagick \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 2e0926ff4..9561fb855 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -157,6 +157,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ ffi \ imagick \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index 49fcbc803..aa6029cdd 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -157,6 +157,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ ffi \ imagick \ From e4f9e6f0075c80b174bad895d6f790648ad8fa8b Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 14 Feb 2024 16:38:12 +0100 Subject: [PATCH 37/63] fix: php8.3 contain ftp module --- docker/php-official/5.6/Dockerfile | 1 + docker/php-official/7.0/Dockerfile | 1 + docker/php-official/7.1/Dockerfile | 1 + docker/php-official/7.2/Dockerfile | 1 + docker/php-official/7.3/Dockerfile | 1 + docker/php-official/7.4/Dockerfile | 1 + docker/php-official/8.0/Dockerfile | 1 + docker/php-official/8.1/Dockerfile | 1 + docker/php-official/8.2/Dockerfile | 1 + docker/php-official/8.3/Dockerfile | 1 + template/Dockerfile/images/php.jinja2 | 1 + 11 files changed, 11 insertions(+) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 6b5cac51f..5b594adb3 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 5ae253d87..3dbe7987e 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 239e347a7..a6ac17eb5 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index cf8817b55..ece8bd05b 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index af4cbd357..033796fc1 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 780894e0a..1cd10e6a4 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -147,6 +147,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 2f297fb63..86e1c7140 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -152,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index b0c91d8b1..623b38fc8 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -152,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index d96fbd472..276915254 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -152,6 +152,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index 165e2bacc..7315e47e0 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -151,6 +151,7 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index cee9410c1..4ed2c97dd 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -87,6 +87,7 @@ bz2 \ calendar \ exif \ + ftp \ gmp \ intl \ gettext \ From 4e73e3d1e96703396fc759b199e548cfe4180c3c Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Wed, 21 Feb 2024 16:16:01 +0100 Subject: [PATCH 38/63] fix: add libldap-common resolves #509 --- docker/php-official/5.6/Dockerfile | 1 + docker/php-official/7.0/Dockerfile | 1 + docker/php-official/7.1/Dockerfile | 1 + docker/php-official/7.2/Dockerfile | 1 + docker/php-official/7.3/Dockerfile | 1 + docker/php-official/7.4/Dockerfile | 1 + docker/php-official/8.0/Dockerfile | 1 + docker/php-official/8.1/Dockerfile | 1 + docker/php-official/8.2/Dockerfile | 1 + docker/php-official/8.3/Dockerfile | 1 + template/Dockerfile/images/php.jinja2 | 1 + 11 files changed, 11 insertions(+) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 5b594adb3..de0ae802e 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 3dbe7987e..2afcbbe5e 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a6ac17eb5..596a50964 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index ece8bd05b..63dd135cc 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 033796fc1..7c68e01ff 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 1cd10e6a4..39e9ae72f 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 86e1c7140..33432606b 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 623b38fc8..c284f8fb5 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 276915254..0b37fddae 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -100,6 +100,7 @@ RUN set -x \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index 7315e47e0..763f02043 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -99,6 +99,7 @@ RUN set -x \ librabbitmq4 \ libldap-2.5-0 \ libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 4ed2c97dd..bdc472fa3 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -26,6 +26,7 @@ zlibc \ {%- endif %} libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ From 09d1541054d7cfdb885f23550ebfa2a7b485ad5a Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 28 Jun 2024 22:13:33 +0200 Subject: [PATCH 39/63] task: update php base images to bookworm --- conf/console.yml | 8 ++------ docker/php-official/8.0/Dockerfile | 9 ++++----- docker/php-official/8.0/Dockerfile.jinja2 | 6 +++--- docker/php-official/8.1/Dockerfile | 9 ++++----- docker/php-official/8.1/Dockerfile.jinja2 | 6 +++--- docker/php-official/8.2/Dockerfile | 9 ++++----- docker/php-official/8.2/Dockerfile.jinja2 | 6 +++--- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/conf/console.yml b/conf/console.yml index 807372d95..a5f536a12 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,11 +43,7 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php[^:]*:8.(0|1|2)': - OS_FAMILY: 'debian' - OS_VERSION: '10' - PHP_OFFICIAL: '1' - 'php[^:]*:8.3': + 'php[^:]*:8.(0|1|2|3)': OS_FAMILY: 'debian' OS_VERSION: '12' - PHP_OFFICIAL: '1' \ No newline at end of file + PHP_OFFICIAL: '1' diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 33432606b..6c2db0712 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.0-fpm-buster +FROM php:8.0-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 index 70656d01e..f4803b855 100644 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ b/docker/php-official/8.0/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.0-fpm-buster") }} +{{ docker.fromOfficial("php", "8.0-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.0') }} \ + {{ php.official(version='8.0',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index c284f8fb5..165f76b6c 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.1-fpm-buster +FROM php:8.1-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 index d116bbc4a..b04f11f2a 100644 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.1-fpm-buster") }} +{{ docker.fromOfficial("php", "8.1-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.1') }} \ + {{ php.official(version='8.1',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 0b37fddae..ac4c78ac3 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.2-fpm-buster +FROM php:8.2-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.2/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 4d2290454..2ffbae9f4 100644 --- a/docker/php-official/8.2/Dockerfile.jinja2 +++ b/docker/php-official/8.2/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.2-fpm-buster") }} +{{ docker.fromOfficial("php", "8.2-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.2') }} \ + {{ php.official(version='8.2',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} From 7b30e7cf3528080017800d53915eb8732df0d422 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 28 Jun 2024 22:16:40 +0200 Subject: [PATCH 40/63] task: blacklist 8.0 --- ci/BLACKLIST | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/BLACKLIST b/ci/BLACKLIST index 31c82c306..fa626e512 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -4,4 +4,5 @@ 7.2 7.3 7.4 +8.0 ssh From 5fed025a6d5c25823efa1a6150aab07c5a5538a9 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 28 Jun 2024 22:39:39 +0200 Subject: [PATCH 41/63] fix: alpine builds --- .gitlab-ci.yml | 574 +++++------------- ci/composer.lock | 195 +++--- docker/php-official/8.1-alpine/Dockerfile | 11 +- .../php-official/8.1-alpine/Dockerfile.jinja2 | 11 +- docker/php-official/8.2-alpine/Dockerfile | 11 +- .../php-official/8.2-alpine/Dockerfile.jinja2 | 11 +- docker/php-official/8.3-alpine/Dockerfile | 11 +- .../php-official/8.3-alpine/Dockerfile.jinja2 | 11 +- 8 files changed, 266 insertions(+), 569 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5523585ea..8bd08c4a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65969e81a9fbe7.15220176' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fbe7.15220176' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_667f1a78e986a1.43610572' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e986a1.43610572' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYTlmYmU3LjE1MjIwMTc2In0= Dockerfile_65969e81a9fbe7.15220176' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk4NmExLjQzNjEwNTcyIn0= Dockerfile_667f1a78e986a1.43610572' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -51,10 +51,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65969e81a9fe36.86754873' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fe36.86754873' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_667f1a78e98b03.36105140' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98b03.36105140' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWE5ZmUzNi44Njc1NDg3MyJ9 Dockerfile_65969e81a9fe36.86754873' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OGIwMy4zNjEwNTE0MCJ9 Dockerfile_667f1a78e98b03.36105140' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -74,10 +74,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65969e81a9ffb3.78311157' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9ffb3.78311157' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_667f1a78e98e48.66717548' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98e48.66717548' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhOWZmYjMuNzgzMTExNTcifQ== Dockerfile_65969e81a9ffb3.78311157' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOThlNDguNjY3MTc1NDgifQ== Dockerfile_667f1a78e98e48.66717548' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -95,10 +95,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65969e81aa0137.94179778' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0137.94179778' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_667f1a78e99111.96614651' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99111.96614651' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwMTM3Ljk0MTc5Nzc4In0= Dockerfile_65969e81aa0137.94179778' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5MTExLjk2NjE0NjUxIn0= Dockerfile_667f1a78e99111.96614651' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -116,10 +116,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65969e81aa0323.30434210' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0323.30434210' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_667f1a78e993c5.66917319' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e993c5.66917319' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTAzMjMuMzA0MzQyMTAifQ== Dockerfile_65969e81aa0323.30434210' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTkzYzUuNjY5MTczMTkifQ== Dockerfile_667f1a78e993c5.66917319' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -139,10 +139,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65969e81aa05b0.92099237' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa05b0.92099237' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_667f1a78e996a9.79805936' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e996a9.79805936' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTA1YjAuOTIwOTkyMzcifQ== Dockerfile_65969e81aa05b0.92099237' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTk2YTkuNzk4MDU5MzYifQ== Dockerfile_667f1a78e996a9.79805936' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -164,10 +164,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65969e81aa0759.94045219' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0759.94045219' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_667f1a78e99961.24720922' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99961.24720922' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwNzU5Ljk0MDQ1MjE5In0= Dockerfile_65969e81aa0759.94045219' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5OTYxLjI0NzIwOTIyIn0= Dockerfile_667f1a78e99961.24720922' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -189,10 +189,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65969e81aa08b7.18673792' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa08b7.18673792' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_667f1a78e99c11.48948582' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99c11.48948582' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMDhiNy4xODY3Mzc5MiJ9 Dockerfile_65969e81aa08b7.18673792' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OWMxMS40ODk0ODU4MiJ9 Dockerfile_667f1a78e99c11.48948582' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -230,10 +230,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65969e81aa0ea2.54872229' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0ea2.54872229' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_667f1a78e9a425.86024047' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9a425.86024047' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMGVhMi41NDg3MjIyOSJ9 Dockerfile_65969e81aa0ea2.54872229' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5YTQyNS44NjAyNDA0NyJ9 Dockerfile_667f1a78e9a425.86024047' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -267,10 +267,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65969e81aa22e5.03607832' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa22e5.03607832' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_667f1a78e9c787.18338734' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9c787.18338734' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyMmU1LjAzNjA3ODMyIn0= Dockerfile_65969e81aa22e5.03607832' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljNzg3LjE4MzM4NzM0In0= Dockerfile_667f1a78e9c787.18338734' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -292,10 +292,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65969e81aa2474.20871582' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2474.20871582' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_667f1a78e9ca18.84839188' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ca18.84839188' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjQ3NC4yMDg3MTU4MiJ9 Dockerfile_65969e81aa2474.20871582' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2ExOC44NDgzOTE4OCJ9 Dockerfile_667f1a78e9ca18.84839188' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -315,10 +315,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65969e81aa25f1.32995116' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa25f1.32995116' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_667f1a78e9cc28.80853000' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cc28.80853000' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyNWYxLjMyOTk1MTE2In0= Dockerfile_65969e81aa25f1.32995116' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljYzI4LjgwODUzMDAwIn0= Dockerfile_667f1a78e9cc28.80853000' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -338,10 +338,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65969e81aa2798.35883166' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2798.35883166' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_667f1a78e9cf03.94640741' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cf03.94640741' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjc5OC4zNTg4MzE2NiJ9 Dockerfile_65969e81aa2798.35883166' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2YwMy45NDY0MDc0MSJ9 Dockerfile_667f1a78e9cf03.94640741' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -359,10 +359,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65969e81aa28e3.42650509' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa28e3.42650509' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_667f1a78e9d122.49340362' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d122.49340362' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjhlMy40MjY1MDUwOSJ9 Dockerfile_65969e81aa28e3.42650509' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDEyMi40OTM0MDM2MiJ9 Dockerfile_667f1a78e9d122.49340362' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -380,10 +380,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65969e81aa2a56.91619924' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2a56.91619924' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_667f1a78e9d325.79477395' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d325.79477395' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTJhNTYuOTE2MTk5MjQifQ== Dockerfile_65969e81aa2a56.91619924' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWQzMjUuNzk0NzczOTUifQ== Dockerfile_667f1a78e9d325.79477395' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -401,10 +401,10 @@ stages: - 'cd docker/php-official/8.3' - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65969e81aa2c00.96913904' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2c00.96913904' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_667f1a78e9d503.69654040' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d503.69654040' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyYzAwLjk2OTEzOTA0In0= Dockerfile_65969e81aa2c00.96913904' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkNTAzLjY5NjU0MDQwIn0= Dockerfile_667f1a78e9d503.69654040' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - 'docker push webdevops/php:8.3' @@ -426,10 +426,10 @@ stages: - 'cd docker/php-dev/8.3' - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65969e81aa2dc5.21195258' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2dc5.21195258' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_667f1a78e9d745.04130984' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d745.04130984' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMmRjNS4yMTE5NTI1OCJ9 Dockerfile_65969e81aa2dc5.21195258' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDc0NS4wNDEzMDk4NCJ9 Dockerfile_667f1a78e9d745.04130984' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3' @@ -449,10 +449,10 @@ stages: - 'cd docker/php-nginx/8.3' - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65969e81aa30f3.78486684' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa30f3.78486684' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_667f1a78e9d9b6.72303514' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d9b6.72303514' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEzMGYzLjc4NDg2Njg0In0= Dockerfile_65969e81aa30f3.78486684' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkOWI2LjcyMzAzNTE0In0= Dockerfile_667f1a78e9d9b6.72303514' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3' @@ -472,10 +472,10 @@ stages: - 'cd docker/php-nginx-dev/8.3' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65969e81aa32b7.36398353' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa32b7.36398353' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_667f1a78e9dc76.11125850' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9dc76.11125850' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzJiNy4zNjM5ODM1MyJ9 Dockerfile_65969e81aa32b7.36398353' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGM3Ni4xMTEyNTg1MCJ9 Dockerfile_667f1a78e9dc76.11125850' - 'docker push webdevops/php-nginx-dev:8.3' - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' @@ -493,10 +493,10 @@ stages: - 'cd docker/php-apache/8.3' - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65969e81aa3413.33167586' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3413.33167586' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_667f1a78e9de76.40274417' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9de76.40274417' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzQxMy4zMzE2NzU4NiJ9 Dockerfile_65969e81aa3413.33167586' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGU3Ni40MDI3NDQxNyJ9 Dockerfile_667f1a78e9de76.40274417' - 'docker push webdevops/php-apache:8.3' - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' @@ -514,10 +514,10 @@ stages: - 'cd docker/php-apache-dev/8.3' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65969e81aa3595.03706036' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3595.03706036' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_667f1a78e9e033.60561999' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9e033.60561999' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTM1OTUuMDM3MDYwMzYifQ== Dockerfile_65969e81aa3595.03706036' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWUwMzMuNjA1NjE5OTkifQ== Dockerfile_667f1a78e9e033.60561999' - 'docker push webdevops/php-apache-dev:8.3' - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' @@ -535,10 +535,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65969e81aa4c48.63440216' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4c48.63440216' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_667f1a78e9fd69.08017350' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9fd69.08017350' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGM0OC42MzQ0MDIxNiJ9 Dockerfile_65969e81aa4c48.63440216' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZmQ2OS4wODAxNzM1MCJ9 Dockerfile_667f1a78e9fd69.08017350' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -560,10 +560,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65969e81aa4de7.33195445' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4de7.33195445' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_667f1a78e9ff80.10051609' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ff80.10051609' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTRkZTcuMzMxOTU0NDUifQ== Dockerfile_65969e81aa4de7.33195445' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWZmODAuMTAwNTE2MDkifQ== Dockerfile_667f1a78e9ff80.10051609' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -583,10 +583,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65969e81aa4f93.58890182' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4f93.58890182' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_667f1a78ea0223.80714897' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0223.80714897' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGY5My41ODg5MDE4MiJ9 Dockerfile_65969e81aa4f93.58890182' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhMDIyMy44MDcxNDg5NyJ9 Dockerfile_667f1a78ea0223.80714897' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -606,10 +606,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65969e81aa5164.98447807' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5164.98447807' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_667f1a78ea0482.28125239' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0482.28125239' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUxNjQuOTg0NDc4MDcifQ== Dockerfile_65969e81aa5164.98447807' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA0ODIuMjgxMjUyMzkifQ== Dockerfile_667f1a78ea0482.28125239' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -617,27 +617,6 @@ stages: - aws needs: - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-nginx-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65969e81aa52c4.21199013' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa52c4.21199013' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUyYzQuMjExOTkwMTMifQ== Dockerfile_65969e81aa52c4.21199013' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.2-alpine' 'webdevops/php-apache:8.2-alpine': stage: level3 before_script: @@ -648,10 +627,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65969e81aa5416.86506770' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5416.86506770' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_667f1a78ea06f5.64008708' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea06f5.64008708' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTU0MTYuODY1MDY3NzAifQ== Dockerfile_65969e81aa5416.86506770' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA2ZjUuNjQwMDg3MDgifQ== Dockerfile_667f1a78ea06f5.64008708' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -669,10 +648,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65969e81aa5562.54359563' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5562.54359563' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_667f1a78ea0940.45216278' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0940.45216278' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE1NTYyLjU0MzU5NTYzIn0= Dockerfile_65969e81aa5562.54359563' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWEwOTQwLjQ1MjE2Mjc4In0= Dockerfile_667f1a78ea0940.45216278' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -680,140 +659,6 @@ stages: - aws needs: - 'webdevops/php-apache:8.2-alpine' -'webdevops/php:8.0-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.0-alpine' - - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65969e81aa7783.30504506' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7783.30504506' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNzc4My4zMDUwNDUwNiJ9 Dockerfile_65969e81aa7783.30504506' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.0-alpine' - - 'docker tag webdevops/php:8.0-alpine $CI_REGISTRY_IMAGE/php:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0-alpine' - - 'docker tag webdevops/php:8.0-alpine webdevops/php-official:8.0-alpine' - - 'docker push webdevops/php-official:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65969e81aa7a03.16807747' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7a03.16807747' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdhMDMuMTY4MDc3NDcifQ== Dockerfile_65969e81aa7a03.16807747' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0-alpine' - - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-nginx:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65969e81aa7be3.43250156' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7be3.43250156' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhN2JlMy40MzI1MDE1NiJ9 Dockerfile_65969e81aa7be3.43250156' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0-alpine' - - 'docker tag webdevops/php-nginx:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-nginx-dev:8.0-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65969e81aa7d86.66793645' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7d86.66793645' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdkODYuNjY3OTM2NDUifQ== Dockerfile_65969e81aa7d86.66793645' - - 'docker push webdevops/php-nginx-dev:8.0-alpine' - - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.0-alpine' -'webdevops/php-apache:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65969e81aa7f81.41127162' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7f81.41127162' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdmODEuNDExMjcxNjIifQ== Dockerfile_65969e81aa7f81.41127162' - - 'docker push webdevops/php-apache:8.0-alpine' - - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-apache-dev:8.0-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65969e81aa80f5.58702224' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa80f5.58702224' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4MGY1LjU4NzAyMjI0In0= Dockerfile_65969e81aa80f5.58702224' - - 'docker push webdevops/php-apache-dev:8.0-alpine' - - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.0-alpine' 'webdevops/php:8.1-alpine': stage: level2 before_script: @@ -824,10 +669,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65969e81aa8276.62506533' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8276.62506533' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_667f1a78ea5481.67757977' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5481.67757977' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODI3Ni42MjUwNjUzMyJ9 Dockerfile_65969e81aa8276.62506533' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNTQ4MS42Nzc1Nzk3NyJ9 Dockerfile_667f1a78ea5481.67757977' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -849,10 +694,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65969e81aa8427.09198127' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8427.09198127' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_667f1a78ea57d7.69758972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea57d7.69758972' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg0MjcuMDkxOTgxMjcifQ== Dockerfile_65969e81aa8427.09198127' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTU3ZDcuNjk3NTg5NzIifQ== Dockerfile_667f1a78ea57d7.69758972' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -872,10 +717,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65969e81aa8605.38624016' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8605.38624016' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_667f1a78ea5ad9.12373386' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5ad9.12373386' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODYwNS4zODYyNDAxNiJ9 Dockerfile_65969e81aa8605.38624016' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNWFkOS4xMjM3MzM4NiJ9 Dockerfile_667f1a78ea5ad9.12373386' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -895,10 +740,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65969e81aa87a7.17178267' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa87a7.17178267' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_667f1a78ea5df7.88542972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5df7.88542972' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg3YTcuMTcxNzgyNjcifQ== Dockerfile_65969e81aa87a7.17178267' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTVkZjcuODg1NDI5NzIifQ== Dockerfile_667f1a78ea5df7.88542972' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -916,10 +761,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65969e81aa8921.55210754' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8921.55210754' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_667f1a78ea60d4.57421920' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea60d4.57421920' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg5MjEuNTUyMTA3NTQifQ== Dockerfile_65969e81aa8921.55210754' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTYwZDQuNTc0MjE5MjAifQ== Dockerfile_667f1a78ea60d4.57421920' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -937,10 +782,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65969e81aa8ac9.88472855' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8ac9.88472855' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_667f1a78ea6379.68528757' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea6379.68528757' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4YWM5Ljg4NDcyODU1In0= Dockerfile_65969e81aa8ac9.88472855' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE2Mzc5LjY4NTI4NzU3In0= Dockerfile_667f1a78ea6379.68528757' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -958,10 +803,10 @@ stages: - 'cd docker/php-official/8.3-alpine' - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65969e81aaa4e7.42601644' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa4e7.42601644' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_667f1a78ea8b41.81742789' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8b41.81742789' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYTRlNy40MjYwMTY0NCJ9 Dockerfile_65969e81aaa4e7.42601644' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOGI0MS44MTc0Mjc4OSJ9 Dockerfile_667f1a78ea8b41.81742789' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - 'docker push webdevops/php:8.3-alpine' @@ -983,10 +828,10 @@ stages: - 'cd docker/php-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65969e81aaa7f8.89428890' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa7f8.89428890' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_667f1a78ea8e30.16387680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8e30.16387680' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWE3ZjguODk0Mjg4OTAifQ== Dockerfile_65969e81aaa7f8.89428890' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYThlMzAuMTYzODc2ODAifQ== Dockerfile_667f1a78ea8e30.16387680' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3-alpine' @@ -1006,10 +851,10 @@ stages: - 'cd docker/php-nginx/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65969e81aaab30.24147828' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaab30.24147828' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_667f1a78ea90c7.39536377' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea90c7.39536377' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYWIzMC4yNDE0NzgyOCJ9 Dockerfile_65969e81aaab30.24147828' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOTBjNy4zOTUzNjM3NyJ9 Dockerfile_667f1a78ea90c7.39536377' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3-alpine' @@ -1019,6 +864,27 @@ stages: - aws needs: - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_667f1a78ea9382.50928096' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9382.50928096' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTkzODIuNTA5MjgwOTYifQ== Dockerfile_667f1a78ea9382.50928096' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3-alpine' 'webdevops/php-apache:8.3-alpine': stage: level3 before_script: @@ -1029,10 +895,10 @@ stages: - 'cd docker/php-apache/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65969e81aaaf12.92675578' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaaf12.92675578' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_667f1a78ea9618.83273110' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9618.83273110' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWFmMTIuOTI2NzU1NzgifQ== Dockerfile_65969e81aaaf12.92675578' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTk2MTguODMyNzMxMTAifQ== Dockerfile_667f1a78ea9618.83273110' - 'docker push webdevops/php-apache:8.3-alpine' - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' @@ -1050,10 +916,10 @@ stages: - 'cd docker/php-apache-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65969e81aab221.09271346' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab221.09271346' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_667f1a78ea98a5.83179491' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea98a5.83179491' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiMjIxLjA5MjcxMzQ2In0= Dockerfile_65969e81aab221.09271346' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5OGE1LjgzMTc5NDkxIn0= Dockerfile_667f1a78ea98a5.83179491' - 'docker push webdevops/php-apache-dev:8.3-alpine' - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' @@ -1071,10 +937,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65969e81aab589.41021901' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab589.41021901' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_667f1a78ea9b24.63300881' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9b24.63300881' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiNTg5LjQxMDIxOTAxIn0= Dockerfile_65969e81aab589.41021901' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5YjI0LjYzMzAwODgxIn0= Dockerfile_667f1a78ea9b24.63300881' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -1096,10 +962,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65969e81aab8d8.02649728' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab8d8.02649728' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_667f1a78ea9e21.36207680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9e21.36207680' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYjhkOC4wMjY0OTcyOCJ9 Dockerfile_65969e81aab8d8.02649728' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOWUyMS4zNjIwNzY4MCJ9 Dockerfile_667f1a78ea9e21.36207680' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -1119,10 +985,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65969e81aabc30.36776190' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabc30.36776190' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_667f1a78eaa153.04305152' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa153.04305152' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiYzMwLjM2Nzc2MTkwIn0= Dockerfile_65969e81aabc30.36776190' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWFhMTUzLjA0MzA1MTUyIn0= Dockerfile_667f1a78eaa153.04305152' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -1142,10 +1008,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65969e81aabea0.64919119' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabea0.64919119' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_667f1a78eaa4e0.42729575' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa4e0.42729575' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYmVhMC42NDkxOTExOSJ9 Dockerfile_65969e81aabea0.64919119' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTRlMC40MjcyOTU3NSJ9 Dockerfile_667f1a78eaa4e0.42729575' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -1163,10 +1029,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65969e81aac041.54500485' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac041.54500485' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_667f1a78eaa807.54530156' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa807.54530156' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzA0MS41NDUwMDQ4NSJ9 Dockerfile_65969e81aac041.54500485' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTgwNy41NDUzMDE1NiJ9 Dockerfile_667f1a78eaa807.54530156' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -1184,10 +1050,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65969e81aac277.34648619' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac277.34648619' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_667f1a78eaac02.87762131' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaac02.87762131' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWMyNzcuMzQ2NDg2MTkifQ== Dockerfile_65969e81aac277.34648619' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYWFjMDIuODc3NjIxMzEifQ== Dockerfile_667f1a78eaac02.87762131' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -1195,137 +1061,3 @@ stages: - aws needs: - 'webdevops/php-apache:8.1' -'webdevops/php:8.0': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.0' - - 'docker build --no-cache -t webdevops/php:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65969e81aac4f1.09200919' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac4f1.09200919' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjNGYxLjA5MjAwOTE5In0= Dockerfile_65969e81aac4f1.09200919' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - - 'docker push webdevops/php:8.0' - - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0' - - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' - - 'docker push webdevops/php-official:8.0' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.0' - - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65969e81aac786.86881703' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac786.86881703' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzc4Ni44Njg4MTcwMyJ9 Dockerfile_65969e81aac786.86881703' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0' - - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.0' - - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65969e81aac9c1.86208219' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac9c1.86208219' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjOWMxLjg2MjA4MjE5In0= Dockerfile_65969e81aac9c1.86208219' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0' - - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx-dev:8.0': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.0' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65969e81aacd19.15906247' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacd19.15906247' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2QxOS4xNTkwNjI0NyJ9 Dockerfile_65969e81aacd19.15906247' - - 'docker push webdevops/php-nginx-dev:8.0' - - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.0' -'webdevops/php-apache:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.0' - - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65969e81aacf95.68202676' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacf95.68202676' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2Y5NS42ODIwMjY3NiJ9 Dockerfile_65969e81aacf95.68202676' - - 'docker push webdevops/php-apache:8.0' - - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-apache-dev:8.0': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.0' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65969e81aad196.17719885' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aad196.17719885' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWQxOTYuMTc3MTk4ODUifQ== Dockerfile_65969e81aad196.17719885' - - 'docker push webdevops/php-apache-dev:8.0' - - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php-apache:8.0' diff --git a/ci/composer.lock b/ci/composer.lock index 0b69e470e..576a5aeef 100644 --- a/ci/composer.lock +++ b/ci/composer.lock @@ -110,24 +110,24 @@ }, { "name": "symfony/console", - "version": "v6.2.1", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f" + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", + "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.4|^6.0" + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -141,18 +141,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -181,12 +179,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.1" + "source": "https://github.com/symfony/console/tree/v6.4.9" }, "funding": [ { @@ -202,20 +200,20 @@ "type": "tidelift" } ], - "time": "2022-12-01T13:44:20+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -224,7 +222,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -253,7 +251,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -269,20 +267,20 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -296,9 +294,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -335,7 +330,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -351,20 +346,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -375,9 +370,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -416,7 +408,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" }, "funding": [ { @@ -432,20 +424,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -456,9 +448,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -500,7 +489,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" }, "funding": [ { @@ -516,20 +505,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -543,9 +532,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -583,7 +569,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -599,20 +585,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/process", - "version": "v6.2.0", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877" + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ba6e55359f8f755fe996c58a81e00eaa67a35877", - "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877", + "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", "shasum": "" }, "require": { @@ -644,7 +630,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.0" + "source": "https://github.com/symfony/process/tree/v6.4.8" }, "funding": [ { @@ -660,36 +646,34 @@ "type": "tidelift" } ], - "time": "2022-11-02T09:08:04+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.1.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -729,7 +713,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -745,38 +729,39 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:18:58+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v6.2.0", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36" + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/145702685e0d12f81d755c71127bfff7582fdd36", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36", + "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -815,7 +800,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.0" + "source": "https://github.com/symfony/string/tree/v7.1.2" }, "funding": [ { @@ -831,34 +816,32 @@ "type": "tidelift" } ], - "time": "2022-11-30T17:13:47+00:00" + "time": "2024-06-28T09:27:18+00:00" }, { "name": "symfony/yaml", - "version": "v6.2.0", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f2570f21bd4adc3589aa3133323273995109bae0" + "reference": "52903de178d542850f6f341ba92995d3d63e60c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f2570f21bd4adc3589aa3133323273995109bae0", - "reference": "f2570f21bd4adc3589aa3133323273995109bae0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", + "reference": "52903de178d542850f6f341ba92995d3d63e60c9", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -889,7 +872,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.2.0" + "source": "https://github.com/symfony/yaml/tree/v6.4.8" }, "funding": [ { @@ -905,7 +888,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T19:00:27+00:00" + "time": "2024-05-31T14:49:08+00:00" } ], "packages-dev": [], @@ -916,5 +899,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index af79b0266..410833bb6 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index d173c0ed8..b8f6232f7 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.1') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 9561fb855..16155a78b 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.2-alpine/Dockerfile.jinja2 b/docker/php-official/8.2-alpine/Dockerfile.jinja2 index 7d2ee3bfb..874bd9698 100644 --- a/docker/php-official/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.2-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.2') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index aa6029cdd..a8727bd9d 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.3-alpine/Dockerfile.jinja2 b/docker/php-official/8.3-alpine/Dockerfile.jinja2 index 9cb68558b..a11af6e8b 100644 --- a/docker/php-official/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.3-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.3') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} From b5ca3d554b48e26675ec4a3e6c69533b27fdad99 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Fri, 28 Jun 2024 23:12:13 +0200 Subject: [PATCH 42/63] fix: alpine builds --- docker/php-apache-dev/8.0-alpine/Dockerfile | 3 +-- docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache-dev/8.1-alpine/Dockerfile | 3 +-- docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache-dev/8.2-alpine/Dockerfile | 3 +-- docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache-dev/8.3-alpine/Dockerfile | 3 +-- docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache/8.0-alpine/Dockerfile | 3 +-- docker/php-apache/8.0-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache/8.1-alpine/Dockerfile | 3 +-- docker/php-apache/8.1-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache/8.2-alpine/Dockerfile | 3 +-- docker/php-apache/8.2-alpine/Dockerfile.jinja2 | 3 +-- docker/php-apache/8.3-alpine/Dockerfile | 3 +-- docker/php-apache/8.3-alpine/Dockerfile.jinja2 | 3 +-- docker/php-dev/8.0-alpine/Dockerfile | 3 +-- docker/php-dev/8.0-alpine/Dockerfile.jinja2 | 3 +-- docker/php-dev/8.1-alpine/Dockerfile | 3 +-- docker/php-dev/8.1-alpine/Dockerfile.jinja2 | 3 +-- docker/php-dev/8.2-alpine/Dockerfile | 3 +-- docker/php-dev/8.2-alpine/Dockerfile.jinja2 | 3 +-- docker/php-dev/8.3-alpine/Dockerfile | 3 +-- docker/php-dev/8.3-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx-dev/8.0-alpine/Dockerfile | 3 +-- docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx-dev/8.1-alpine/Dockerfile | 3 +-- docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx-dev/8.2-alpine/Dockerfile | 3 +-- docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx-dev/8.3-alpine/Dockerfile | 3 +-- docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx/8.0-alpine/Dockerfile | 3 +-- docker/php-nginx/8.0-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx/8.1-alpine/Dockerfile | 3 +-- docker/php-nginx/8.1-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx/8.2-alpine/Dockerfile | 3 +-- docker/php-nginx/8.2-alpine/Dockerfile.jinja2 | 3 +-- docker/php-nginx/8.3-alpine/Dockerfile | 3 +-- docker/php-nginx/8.3-alpine/Dockerfile.jinja2 | 3 +-- 40 files changed, 40 insertions(+), 80 deletions(-) diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 90be8e5c5..281dd770e 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 index 4c7c36014..a0050e801 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8ca77ae5f..c9fcf72fe 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 index 7abed43e5..fff6f7d7c 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index 681aebd27..70445ab4d 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 index 8277c3a77..c68e37beb 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile index 82a6f079b..b03474d47 100644 --- a/docker/php-apache-dev/8.3-alpine/Dockerfile +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 index 7924efa27..274c48746 100644 --- a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 66ac95743..02f34eae9 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 index 9c90154e7..5c7635476 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 9c6f00f7b..921f97317 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 index 11c65544c..314711d47 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile index 6c061c99a..018e992e4 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile +++ b/docker/php-apache/8.2-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 index c358fef80..9d86aecba 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.3-alpine/Dockerfile b/docker/php-apache/8.3-alpine/Dockerfile index d517235ce..9dc541057 100644 --- a/docker/php-apache/8.3-alpine/Dockerfile +++ b/docker/php-apache/8.3-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 index 8c360939f..59e5ec3ff 100644 --- a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index cfe8225b3..efdabcf39 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 index 99986a428..b46bc25ec 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index cd437432c..8befbec67 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 index 1357fad41..172b7e225 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 4d403da03..4ddf0a3d0 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 index 1e8ba3c32..8b308d5d2 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.3-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile index fedef5964..73d20a09f 100644 --- a/docker/php-dev/8.3-alpine/Dockerfile +++ b/docker/php-dev/8.3-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 index da1b39185..599e24028 100644 --- a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index fc7544cc6..baa6de93a 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 index 15a0bcd4c..42ca8087f 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 0c04ace98..e2f717632 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 index d3bd5d756..ca0551600 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index a52a227a7..e2b649587 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 index e2a5982ff..51785650c 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile index 4a53467f1..f5a822f7f 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 index 6c039d628..4ae7147e4 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index ea2937ac3..251eed71f 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 index 6d867c42b..1115c6dd3 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 39e589994..bf47a72e4 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 index 35b37682f..6d53a2548 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile index 1295f85a3..606656154 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile +++ b/docker/php-nginx/8.2-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 index 63235633a..e6291274f 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.3-alpine/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile index 866d63117..d07da4e2b 100644 --- a/docker/php-nginx/8.3-alpine/Dockerfile +++ b/docker/php-nginx/8.3-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 index c6558fc42..1fa397bae 100644 --- a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} From fac097e784b4e853084980eb52dc86834260908c Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sat, 29 Jun 2024 09:51:33 +0200 Subject: [PATCH 43/63] fix: nginx ssl directive deprecated --- docker/nginx/alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/5.6/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.0/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.1/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.2/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.3/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.4/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.0/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.1/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.2/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.3/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf | 1 - provisioning/nginx/general/etc/nginx/vhost.conf | 4 ++-- provisioning/nginx/general/etc/nginx/vhost.ssl.conf | 1 - 40 files changed, 40 insertions(+), 60 deletions(-) diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/nginx/alpine/conf/etc/nginx/vhost.conf +++ b/docker/nginx/alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; diff --git a/provisioning/nginx/general/etc/nginx/vhost.conf b/provisioning/nginx/general/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.conf @@ -15,8 +15,8 @@ server { ############## server { - listen 443 default_server; - listen [::]:443 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _ docker; diff --git a/provisioning/nginx/general/etc/nginx/vhost.ssl.conf b/provisioning/nginx/general/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.ssl.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.ssl.conf @@ -1,4 +1,3 @@ -ssl on; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; ssl_prefer_server_ciphers on; From a718f492486ba01b5e4fd9a8c2999c712b66d76e Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Tue, 6 Aug 2024 11:23:56 +0200 Subject: [PATCH 44/63] task: add excimer, opentelemetry --- README.md | 24 +++++++++++------------ docker/php-official/8.0-alpine/Dockerfile | 6 ++++++ docker/php-official/8.0/Dockerfile | 7 +++++++ docker/php-official/8.1-alpine/Dockerfile | 6 ++++++ docker/php-official/8.1/Dockerfile | 7 +++++++ docker/php-official/8.2-alpine/Dockerfile | 6 ++++++ docker/php-official/8.2/Dockerfile | 7 +++++++ docker/php-official/8.3-alpine/Dockerfile | 6 ++++++ docker/php-official/8.3/Dockerfile | 7 +++++++ template/Dockerfile/images/php.jinja2 | 13 ++++++++++++ 10 files changed, 77 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 848e9742d..027df1a8b 100644 --- a/README.md +++ b/README.md @@ -64,57 +64,57 @@ As in many projects the documentation is kind of up to date 😅. The following images which are currently supported are based on `php:{VER}-fpm-buster`. -* `webdevops/php:7.4` * `webdevops/php:8.0` * `webdevops/php:8.1` * `webdevops/php:8.2` -* `webdevops/php-dev:7.4` +* `webdevops/php:8.3` * `webdevops/php-dev:8.0` * `webdevops/php-dev:8.1` * `webdevops/php-dev:8.2` -* `webdevops/php-apache:7.4` +* `webdevops/php-dev:8.3` * `webdevops/php-apache:8.0` * `webdevops/php-apache:8.1` * `webdevops/php-apache:8.2` -* `webdevops/php-apache-dev:7.4` +* `webdevops/php-apache:8.3` * `webdevops/php-apache-dev:8.0` * `webdevops/php-apache-dev:8.1` * `webdevops/php-apache-dev:8.2` -* `webdevops/php-nginx:7.4` +* `webdevops/php-apache-dev:8.3` * `webdevops/php-nginx:8.0` * `webdevops/php-nginx:8.1` * `webdevops/php-nginx:8.2` -* `webdevops/php-nginx-dev:7.4` +* `webdevops/php-nginx:8.3` * `webdevops/php-nginx-dev:8.0` * `webdevops/php-nginx-dev:8.1` * `webdevops/php-nginx-dev:8.2` +* `webdevops/php-nginx-dev:8.3` ### Alpine PHP The following images which are currently supported are based on `php:{VER}-fpm-alpine`. -* `webdevops/php:7.4-alpine` * `webdevops/php:8.0-alpine` * `webdevops/php:8.1-alpine` * `webdevops/php:8.2-alpine` -* `webdevops/php-dev:7.4-alpine` +* `webdevops/php:8.3-alpine` * `webdevops/php-dev:8.0-alpine` * `webdevops/php-dev:8.1-alpine` * `webdevops/php-dev:8.2-alpine` -* `webdevops/php-apache:7.4-alpine` +* `webdevops/php-dev:8.3-alpine` * `webdevops/php-apache:8.0-alpine` * `webdevops/php-apache:8.1-alpine` * `webdevops/php-apache:8.2-alpine` -* `webdevops/php-apache-dev:7.4-alpine` +* `webdevops/php-apache:8.3-alpine` * `webdevops/php-apache-dev:8.0-alpine` * `webdevops/php-apache-dev:8.1-alpine` * `webdevops/php-apache-dev:8.2-alpine` -* `webdevops/php-nginx:7.4-alpine` +* `webdevops/php-apache-dev:8.3-alpine` * `webdevops/php-nginx:8.0-alpine` * `webdevops/php-nginx:8.1-alpine` * `webdevops/php-nginx:8.2-alpine` -* `webdevops/php-nginx-dev:7.4-alpine` +* `webdevops/php-nginx:8.3-alpine` * `webdevops/php-nginx-dev:8.0-alpine` * `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` +* `webdevops/php-nginx-dev:8.3-alpine` diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index adaf7cd2c..32eaf9688 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -191,6 +191,9 @@ RUN set -x \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -198,6 +201,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 6c2db0712..57ac73ccf 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -149,6 +149,7 @@ RUN set -x \ bcmath \ amqp \ imagick \ + ffi \ bz2 \ calendar \ exif \ @@ -177,11 +178,17 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 410833bb6..0e37ad44a 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -188,6 +188,9 @@ RUN set -x \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -195,6 +198,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 165f76b6c..2ec1c0c33 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -149,6 +149,7 @@ RUN set -x \ bcmath \ amqp \ imagick \ + ffi \ bz2 \ calendar \ exif \ @@ -176,11 +177,17 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 16155a78b..9eae4960e 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -188,6 +188,9 @@ RUN set -x \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -195,6 +198,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index ac4c78ac3..a27f2ac23 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -149,6 +149,7 @@ RUN set -x \ bcmath \ amqp \ imagick \ + ffi \ bz2 \ calendar \ exif \ @@ -176,11 +177,17 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index a8727bd9d..2cf4b1f11 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -188,6 +188,9 @@ RUN set -x \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -195,6 +198,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index 763f02043..ee05344af 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -149,6 +149,7 @@ RUN set -x \ bcmath \ amqp \ imagick \ + ffi \ bz2 \ calendar \ exif \ @@ -176,11 +177,17 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index bdc472fa3..3f6791842 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -84,6 +84,7 @@ {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} amqp \ imagick \ + ffi \ {%- endif %} bz2 \ calendar \ @@ -137,11 +138,17 @@ {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ @@ -322,6 +329,9 @@ {%- endif %} {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -329,6 +339,9 @@ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ From 3b97b136da5e03c488e960a1b2dd5e4937608820 Mon Sep 17 00:00:00 2001 From: Christian Ludwig Date: Tue, 10 Sep 2024 17:42:27 +0200 Subject: [PATCH 45/63] Added PHP 8.3 to image-tag-php.rst --- .../content/DockerImages/dockerfiles/include/image-tag-php.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index 623549d92..b05c4df19 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -10,6 +10,7 @@ Tag Distribution name PHP Version ``8.0`` *customized official php image* PHP 8.0 ``8.1`` *customized official php image* PHP 8.1 ``8.2`` *customized official php image* PHP 8.2 +``8.3`` *customized official php image* PHP 8.3 ``7.1-alpine`` *deprecated* PHP 7.1 ``7.2-alpine`` *deprecated* PHP 7.2 ``7.3-alpine`` *deprecated* PHP 7.3 @@ -17,6 +18,7 @@ Tag Distribution name PHP Version ``8.0-alpine`` *customized official php image* PHP 8.0 ``8.1-alpine`` *customized official php image* PHP 8.1 ``8.2-alpine`` *customized official php image* PHP 8.2 +``8.3-alpine`` *customized official php image* PHP 8.3 ``alpine`` *deprecated* PHP 7.x ``alpine-php7`` *deprecated* PHP 7.x ``alpine-php5`` *deprecated* PHP 5.6 From 2093895663531ef03a16ef4dead7003a05d51427 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 17 Feb 2025 15:58:14 +0100 Subject: [PATCH 46/63] add php 8.4 --- .gitlab-ci.yml | 1274 ++++++++++------- README.md | 18 +- build-local.sh | 52 + ci/src/Commands/GitlabCommand.php | 6 + conf/console.yml | 2 +- docker/php-apache-dev/8.4-alpine/Dockerfile | 38 + .../8.4-alpine/Dockerfile.jinja2 | 11 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache-dev/8.4/Dockerfile | 32 + docker/php-apache-dev/8.4/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.4/conf/bin/service.d/blackfire-agent.sh | 25 + .../8.4/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.4/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache/8.4-alpine/Dockerfile | 33 + .../php-apache/8.4-alpine/Dockerfile.jinja2 | 12 + .../conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.4-alpine/conf/bin/service.d/httpd.sh | 13 + .../8.4-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../conf/etc/httpd/conf.d/10-log.conf | 4 + .../conf/etc/httpd/conf.d/10-php.conf | 37 + .../conf/etc/httpd/conf.d/10-server.conf | 18 + .../8.4-alpine/conf/etc/httpd/global.conf | 1 + .../8.4-alpine/conf/etc/httpd/main.conf | 10 + .../8.4-alpine/conf/etc/httpd/php.conf | 1 + .../8.4-alpine/conf/etc/httpd/ssl/server.crt | 28 + .../8.4-alpine/conf/etc/httpd/ssl/server.csr | 26 + .../8.4-alpine/conf/etc/httpd/ssl/server.key | 51 + .../conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../8.4-alpine/conf/etc/httpd/vhost.conf | 36 + .../8.4-alpine/conf/etc/httpd/vhost.ssl.conf | 26 + .../conf/etc/supervisor.d/apache.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++ .../conf/provision/bootstrap.d/10-php.sh | 8 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-apache/8.4/Dockerfile | 30 + docker/php-apache/8.4/Dockerfile.jinja2 | 13 + .../8.4/conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.4/conf/bin/service.d/httpd.sh | 14 + .../8.4/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../8.4/conf/etc/httpd/conf.d/10-log.conf | 4 + .../8.4/conf/etc/httpd/conf.d/10-php.conf | 37 + .../8.4/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/8.4/conf/etc/httpd/global.conf | 1 + .../php-apache/8.4/conf/etc/httpd/main.conf | 10 + docker/php-apache/8.4/conf/etc/httpd/php.conf | 1 + .../8.4/conf/etc/httpd/ssl/server.crt | 28 + .../8.4/conf/etc/httpd/ssl/server.csr | 26 + .../8.4/conf/etc/httpd/ssl/server.key | 51 + .../8.4/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/8.4/conf/etc/httpd/vhost.conf | 36 + .../8.4/conf/etc/httpd/vhost.ssl.conf | 26 + .../8.4/conf/etc/supervisor.d/apache.conf | 14 + .../8.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++ .../8.4/conf/provision/bootstrap.d/10-php.sh | 8 + .../8.4/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-dev/8.4-alpine/Dockerfile | 30 + docker/php-dev/8.4-alpine/Dockerfile.jinja2 | 7 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ docker/php-dev/8.4/Dockerfile | 24 + docker/php-dev/8.4/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.4/conf/bin/service.d/blackfire-agent.sh | 25 + .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.4/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ docker/php-nginx-dev/8.4-alpine/Dockerfile | 38 + .../8.4-alpine/Dockerfile.jinja2 | 11 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx-dev/8.4/Dockerfile | 32 + docker/php-nginx-dev/8.4/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.4/conf/bin/service.d/blackfire-agent.sh | 25 + .../8.4/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../8.4/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx/8.4-alpine/Dockerfile | 24 + docker/php-nginx/8.4-alpine/Dockerfile.jinja2 | 13 + .../conf/bin/service.d/nginx.d/10-init.sh | 5 + .../8.4-alpine/conf/bin/service.d/nginx.sh | 10 + .../8.4-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../8.4-alpine/conf/etc/nginx/global.conf | 1 + .../8.4-alpine/conf/etc/nginx/main.conf | 4 + .../8.4-alpine/conf/etc/nginx/nginx.conf | 34 + .../8.4-alpine/conf/etc/nginx/php.conf | 1 + .../8.4-alpine/conf/etc/nginx/ssl/server.crt | 28 + .../8.4-alpine/conf/etc/nginx/ssl/server.csr | 26 + .../8.4-alpine/conf/etc/nginx/ssl/server.key | 51 + .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../8.4-alpine/conf/etc/nginx/vhost.conf | 28 + .../8.4-alpine/conf/etc/nginx/vhost.ssl.conf | 6 + .../conf/etc/supervisor.d/nginx.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 + .../conf/provision/bootstrap.d/10-php.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 + docker/php-nginx/8.4/Dockerfile | 28 + docker/php-nginx/8.4/Dockerfile.jinja2 | 14 + .../8.4/conf/bin/service.d/nginx.d/10-init.sh | 5 + .../php-nginx/8.4/conf/bin/service.d/nginx.sh | 10 + .../8.4/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.4/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/8.4/conf/etc/nginx/global.conf | 1 + docker/php-nginx/8.4/conf/etc/nginx/main.conf | 4 + docker/php-nginx/8.4/conf/etc/nginx/php.conf | 1 + .../8.4/conf/etc/nginx/ssl/server.crt | 28 + .../8.4/conf/etc/nginx/ssl/server.csr | 26 + .../8.4/conf/etc/nginx/ssl/server.key | 51 + .../8.4/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/8.4/conf/etc/nginx/vhost.conf | 28 + .../8.4/conf/etc/nginx/vhost.ssl.conf | 6 + .../8.4/conf/etc/supervisor.d/nginx.conf | 14 + .../8.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 + .../8.4/conf/provision/bootstrap.d/10-php.sh | 7 + .../8.4/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 + docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.4-alpine/Dockerfile | 251 ++++ .../php-official/8.4-alpine/Dockerfile.jinja2 | 35 + docker/php-official/8.4-alpine/conf/VERSION | 1 + .../8.4-alpine/conf/bin/bootstrap.sh | 3 + .../8.4-alpine/conf/bin/config.sh | 117 ++ .../8.4-alpine/conf/bin/control.sh | 160 +++ .../8.4-alpine/conf/bin/entrypoint.d/cli.sh | 19 + .../conf/bin/entrypoint.d/default.sh | 3 + .../8.4-alpine/conf/bin/entrypoint.d/noop.sh | 7 + .../8.4-alpine/conf/bin/entrypoint.d/root.sh | 14 + .../conf/bin/entrypoint.d/supervisord.sh | 9 + .../8.4-alpine/conf/bin/entrypoint.sh | 46 + .../8.4-alpine/conf/bin/provision | 8 + .../8.4-alpine/conf/bin/provision.py | 328 +++++ .../conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.4-alpine/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 + .../8.4-alpine/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 + .../8.4-alpine/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 + .../8.4-alpine/conf/bin/service.d/postfix.sh | 42 + .../conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.4-alpine/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 + .../conf/bin/usr-bin/docker-ansible-install | 77 + .../conf/bin/usr-bin/docker-cronjob | 26 + .../conf/bin/usr-bin/docker-php-setting | 44 + .../conf/bin/usr-bin/docker-provision | 9 + .../conf/bin/usr-bin/docker-service | 89 ++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../8.4-alpine/conf/bin/usr-bin/service | 86 ++ .../conf/bin/usr-bin/version-compare | 43 + .../8.4-alpine/conf/etc/cron/.gitkeep | 0 .../8.4-alpine/conf/etc/logrotate.d/php5-fpm | 12 + .../8.4-alpine/conf/etc/logrotate.d/syslog-ng | 38 + .../8.4-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.4-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.4-alpine/conf/etc/php/php.ini | 1 + .../8.4-alpine/conf/etc/php/php.webdevops.ini | 34 + .../8.4-alpine/conf/etc/supervisor.conf | 20 + .../8.4-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 + .../conf/etc/supervisor.d/dnsmasq.conf | 14 + .../conf/etc/supervisor.d/php-fpm.conf | 15 + .../conf/etc/supervisor.d/postfix.conf | 15 + .../8.4-alpine/conf/etc/supervisor.d/ssh.conf | 14 + .../conf/etc/supervisor.d/syslog.conf | 13 + .../conf/etc/syslog-ng/syslog-ng.conf | 48 + .../8.4-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 8 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 + .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 + .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 + .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ++ .../conf/provision/entrypoint.d/20-php.sh | 75 + .../conf/provision/onbuild.d/.gitkeep | 0 .../8.4-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 + .../conf/provision/service.d/dnsmasq.sh | 24 + .../conf/provision/service.d/postfix.sh | 32 + .../conf/provision/service.d/ssh.sh | 17 + .../conf/provision/service.d/syslog.sh | 41 + .../conf/provision/variables-webdevops.yml | 7 + .../8.4-alpine/conf/provision/variables.yml | 7 + docker/php-official/8.4/Dockerfile | 229 +++ docker/php-official/8.4/Dockerfile.jinja2 | 37 + docker/php-official/8.4/conf/VERSION | 1 + docker/php-official/8.4/conf/bin/bootstrap.sh | 3 + docker/php-official/8.4/conf/bin/config.sh | 117 ++ docker/php-official/8.4/conf/bin/control.sh | 160 +++ .../8.4/conf/bin/entrypoint.d/cli.sh | 19 + .../8.4/conf/bin/entrypoint.d/default.sh | 3 + .../8.4/conf/bin/entrypoint.d/noop.sh | 7 + .../8.4/conf/bin/entrypoint.d/root.sh | 14 + .../8.4/conf/bin/entrypoint.d/supervisord.sh | 9 + .../php-official/8.4/conf/bin/entrypoint.sh | 46 + docker/php-official/8.4/conf/bin/provision | 8 + docker/php-official/8.4/conf/bin/provision.py | 328 +++++ .../8.4/conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.4/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 + .../8.4/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 + .../8.4/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 + .../8.4/conf/bin/service.d/postfix.sh | 42 + .../8.4/conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.4/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../8.4/conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../8.4/conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 + .../conf/bin/usr-bin/docker-ansible-install | 77 + .../8.4/conf/bin/usr-bin/docker-cronjob | 26 + .../8.4/conf/bin/usr-bin/docker-php-setting | 44 + .../8.4/conf/bin/usr-bin/docker-provision | 9 + .../8.4/conf/bin/usr-bin/docker-service | 89 ++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../php-official/8.4/conf/bin/usr-bin/service | 86 ++ .../8.4/conf/bin/usr-bin/version-compare | 43 + .../php-official/8.4/conf/etc/cron/.gitkeep | 0 .../8.4/conf/etc/logrotate.d/php5-fpm | 12 + .../8.4/conf/etc/logrotate.d/syslog-ng | 38 + .../8.4/conf/etc/php/conf.d/.gitkeep | 0 .../8.4/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.4/conf/etc/php/php.ini | 1 + .../8.4/conf/etc/php/php.webdevops.ini | 34 + .../php-official/8.4/conf/etc/supervisor.conf | 20 + .../8.4/conf/etc/supervisor.d/.gitkeep | 0 .../8.4/conf/etc/supervisor.d/cron.conf | 14 + .../8.4/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../8.4/conf/etc/supervisor.d/php-fpm.conf | 15 + .../8.4/conf/etc/supervisor.d/postfix.conf | 15 + .../8.4/conf/etc/supervisor.d/ssh.conf | 14 + .../8.4/conf/etc/supervisor.d/syslog.conf | 13 + .../8.4/conf/etc/syslog-ng/syslog-ng.conf | 48 + .../8.4/conf/provision/ansible.cfg | 0 .../8.4/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 10 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../8.4/conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 + .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 + .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 + .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../8.4/conf/provision/build.d/.gitkeep | 0 .../8.4/conf/provision/build.d/10-cleanup.sh | 7 + .../8.4/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ++ .../8.4/conf/provision/entrypoint.d/20-php.sh | 75 + .../8.4/conf/provision/onbuild.d/.gitkeep | 0 .../8.4/conf/provision/roles/.gitkeep | 0 .../8.4/conf/provision/service.d/.gitkeep | 0 .../8.4/conf/provision/service.d/cron.sh | 13 + .../8.4/conf/provision/service.d/dnsmasq.sh | 24 + .../8.4/conf/provision/service.d/postfix.sh | 32 + .../8.4/conf/provision/service.d/ssh.sh | 17 + .../8.4/conf/provision/service.d/syslog.sh | 41 + .../conf/provision/variables-webdevops.yml | 7 + .../8.4/conf/provision/variables.yml | 7 + docker/php/8.3-alpine | 2 +- docker/php/8.4 | 1 + docker/php/8.4-alpine | 1 + .../dockerfiles/include/image-tag-php.rst | 2 + old.gitlab-ci.yml | 1063 ++++++++++++++ template/Dockerfile/images/php.jinja2 | 32 +- 378 files changed, 9988 insertions(+), 530 deletions(-) create mode 100755 build-local.sh create mode 100644 docker/php-apache-dev/8.4-alpine/Dockerfile create mode 100644 docker/php-apache-dev/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache-dev/8.4/Dockerfile create mode 100644 docker/php-apache-dev/8.4/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache/8.4-alpine/Dockerfile create mode 100644 docker/php-apache/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-apache/8.4/Dockerfile create mode 100644 docker/php-apache/8.4/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.4/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.4/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.4/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.4/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.4/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-dev/8.4-alpine/Dockerfile create mode 100644 docker/php-dev/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.4-alpine/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/8.4/Dockerfile create mode 100644 docker/php-dev/8.4/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/Dockerfile create mode 100644 docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx-dev/8.4/Dockerfile create mode 100644 docker/php-nginx-dev/8.4/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx/8.4-alpine/Dockerfile create mode 100644 docker/php-nginx/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-nginx/8.4/Dockerfile create mode 100644 docker/php-nginx/8.4/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.4/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.4/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.4/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.4/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-official/8.4-alpine/Dockerfile create mode 100644 docker/php-official/8.4-alpine/Dockerfile.jinja2 create mode 100644 docker/php-official/8.4-alpine/conf/VERSION create mode 100644 docker/php-official/8.4-alpine/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/config.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/control.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.4-alpine/conf/bin/provision create mode 100755 docker/php-official/8.4-alpine/conf/bin/provision.py create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.4-alpine/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/etc/php/php.ini create mode 100644 docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.4-alpine/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.4-alpine/conf/provision/variables.yml create mode 100644 docker/php-official/8.4/Dockerfile create mode 100644 docker/php-official/8.4/Dockerfile.jinja2 create mode 100644 docker/php-official/8.4/conf/VERSION create mode 100644 docker/php-official/8.4/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.4/conf/bin/config.sh create mode 100644 docker/php-official/8.4/conf/bin/control.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.4/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.4/conf/bin/provision create mode 100755 docker/php-official/8.4/conf/bin/provision.py create mode 100644 docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.4/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.4/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.4/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.4/conf/etc/php/php.ini create mode 100644 docker/php-official/8.4/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.4/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.4/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.4/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.4/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.4/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.4/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.4/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.4/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.4/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.4/conf/provision/variables.yml create mode 120000 docker/php/8.4 create mode 120000 docker/php/8.4-alpine create mode 100644 old.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bd08c4a4..c988057a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_667f1a78e986a1.43610572' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e986a1.43610572' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_67b33780216a78.44838910' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780216a78.44838910' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk4NmExLjQzNjEwNTcyIn0= Dockerfile_667f1a78e986a1.43610572' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE2YTc4LjQ0ODM4OTEwIn0= Dockerfile_67b33780216a78.44838910' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -41,206 +41,231 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/base:alpine': - stage: level3 +'webdevops/bootstrap:ubuntu-22.04': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base/alpine' - - 'docker build --no-cache -t webdevops/base:alpine .' + - 'cd docker/bootstrap/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_667f1a78e98b03.36105140' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98b03.36105140' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_67b33780214e35.25363639' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780214e35.25363639' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OGIwMy4zNjEwNTE0MCJ9 Dockerfile_667f1a78e98b03.36105140' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTRlMzUuMjUzNjM2MzkifQ== Dockerfile_67b33780214e35.25363639' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - - 'docker push webdevops/base:alpine' - - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' + - 'docker push webdevops/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' + - 'docker push webdevops/bootstrap:latest' tags: - aws needs: - - 'webdevops/bootstrap:alpine' -'webdevops/nginx:alpine': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php:8.1': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/nginx/alpine' - - 'docker build --no-cache -t webdevops/nginx:alpine .' + - 'cd docker/php-official/8.1' + - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_667f1a78e98e48.66717548' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98e48.66717548' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_67b3378024f8d2.27347713' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378024f8d2.27347713' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOThlNDguNjY3MTc1NDgifQ== Dockerfile_667f1a78e98e48.66717548' - - 'docker push webdevops/nginx:alpine' - - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjRmOGQyLjI3MzQ3NzEzIn0= Dockerfile_67b3378024f8d2.27347713' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' + - 'docker push webdevops/php:8.1' + - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1' + - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' + - 'docker push webdevops/php-official:8.1' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/apache:alpine': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php:8.1-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/apache/alpine' - - 'docker build --no-cache -t webdevops/apache:alpine .' + - 'cd docker/php-official/8.1-alpine' + - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_667f1a78e99111.96614651' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99111.96614651' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_67b3378023dc34.89923799' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023dc34.89923799' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5MTExLjk2NjE0NjUxIn0= Dockerfile_667f1a78e99111.96614651' - - 'docker push webdevops/apache:alpine' - - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIzZGMzNC44OTkyMzc5OSJ9 Dockerfile_67b3378023dc34.89923799' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' + - 'docker push webdevops/php-official:8.1-alpine' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/base-app:alpine': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php:8.2': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base-app/alpine' - - 'docker build --no-cache -t webdevops/base-app:alpine .' + - 'cd docker/php-official/8.2' + - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_667f1a78e993c5.66917319' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e993c5.66917319' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_67b33780224305.94882603' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780224305.94882603' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTkzYzUuNjY5MTczMTkifQ== Dockerfile_667f1a78e993c5.66917319' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI0MzA1Ljk0ODgyNjAzIn0= Dockerfile_67b33780224305.94882603' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - - 'docker push webdevops/base-app:alpine' - - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' + - 'docker push webdevops/php:8.2' + - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2' + - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' + - 'docker push webdevops/php-official:8.2' tags: - aws needs: - - 'webdevops/base:alpine' -'webdevops/bootstrap:ubuntu-22.04': + - 'webdevops/toolbox:latest' +'webdevops/php:8.2-alpine': stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/bootstrap/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' + - 'cd docker/php-official/8.2-alpine' + - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_667f1a78e996a9.79805936' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e996a9.79805936' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_67b3378022db19.74137044' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022db19.74137044' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTk2YTkuNzk4MDU5MzYifQ== Dockerfile_667f1a78e996a9.79805936' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyZGIxOS43NDEzNzA0NCJ9 Dockerfile_67b3378022db19.74137044' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - - 'docker push webdevops/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' - - 'docker push webdevops/bootstrap:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' + - 'docker push webdevops/php-official:8.2-alpine' tags: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/base:ubuntu-22.04': - stage: level3 +'webdevops/php:8.3': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' + - 'cd docker/php-official/8.3' + - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_667f1a78e99961.24720922' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99961.24720922' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_67b33780226889.37238216' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780226889.37238216' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5OTYxLjI0NzIwOTIyIn0= Dockerfile_667f1a78e99961.24720922' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI2ODg5LjM3MjM4MjE2In0= Dockerfile_67b33780226889.37238216' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - - 'docker push webdevops/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' - - 'docker push webdevops/base:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' + - 'docker push webdevops/php:8.3' + - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3' + - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' + - 'docker push webdevops/php-official:8.3' tags: - aws needs: - - 'webdevops/bootstrap:ubuntu-22.04' -'webdevops/base-app:ubuntu-22.04': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php:8.3-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/base-app/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' + - 'cd docker/php-official/8.3-alpine' + - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_667f1a78e99c11.48948582' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99c11.48948582' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_67b33780222417.04342489' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780222417.04342489' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OWMxMS40ODk0ODU4MiJ9 Dockerfile_667f1a78e99c11.48948582' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMjQxNy4wNDM0MjQ4OSJ9 Dockerfile_67b33780222417.04342489' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - - 'docker push webdevops/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' - - 'docker push webdevops/base-app:latest' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' + - 'docker push webdevops/php-official:8.3-alpine' tags: - aws needs: - - 'webdevops/base:ubuntu-22.04' -'webdevops/dockerfile-build-env:latest': - stage: level5 + - 'webdevops/toolbox:latest' +'webdevops/php:8.4': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/dockerfile-build-env/latest' - - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' - - 'docker push webdevops/dockerfile-build-env:latest' - - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + - 'cd docker/php-official/8.4' + - 'docker build --no-cache -t webdevops/php:8.4 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.4" >> Dockerfile_67b33780240537.39972307' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780240537.39972307' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjQwNTM3LjM5OTcyMzA3In0= Dockerfile_67b33780240537.39972307' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml' + - 'docker push webdevops/php:8.4' + - 'docker tag webdevops/php:8.4 $CI_REGISTRY_IMAGE/php:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php:8.4' + - 'docker tag webdevops/php:8.4 webdevops/php-official:8.4' + - 'docker push webdevops/php-official:8.4' tags: - aws needs: - - 'webdevops/base-app:ubuntu-22.04' -'webdevops/vsftp:latest': - stage: level4 + - 'webdevops/toolbox:latest' +'webdevops/php:8.4-alpine': + stage: level2 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/vsftp/latest' - - 'docker build --no-cache -t webdevops/vsftp:latest .' + - 'cd docker/php-official/8.4-alpine' + - 'docker build --no-cache -t webdevops/php:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_667f1a78e9a425.86024047' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9a425.86024047' + - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_67b33780220d09.67839072' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780220d09.67839072' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5YTQyNS44NjAyNDA0NyJ9 Dockerfile_667f1a78e9a425.86024047' - - 'docker push webdevops/vsftp:latest' - - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMGQwOS42NzgzOTA3MiJ9 Dockerfile_67b33780220d09.67839072' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.4-alpine' + - 'docker tag webdevops/php:8.4-alpine $CI_REGISTRY_IMAGE/php:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.4-alpine' + - 'docker tag webdevops/php:8.4-alpine webdevops/php-official:8.4-alpine' + - 'docker push webdevops/php-official:8.4-alpine' tags: - aws needs: - - 'webdevops/base:ubuntu-22.04' + - 'webdevops/toolbox:latest' 'webdevops/storage:latest': stage: level2 before_script: @@ -257,98 +282,96 @@ stages: - aws needs: - 'webdevops/toolbox:latest' -'webdevops/php:8.2': - stage: level2 +'webdevops/base:alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.2' - - 'docker build --no-cache -t webdevops/php:8.2 .' + - 'cd docker/base/alpine' + - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_667f1a78e9c787.18338734' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9c787.18338734' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_67b33780216ee1.41883577' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780216ee1.41883577' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljNzg3LjE4MzM4NzM0In0= Dockerfile_667f1a78e9c787.18338734' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNmVlMS40MTg4MzU3NyJ9 Dockerfile_67b33780216ee1.41883577' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - - 'docker push webdevops/php:8.2' - - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - - 'docker push webdevops/php-official:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' + - 'docker push webdevops/base:alpine' + - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base:alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.2': + - 'webdevops/bootstrap:alpine' +'webdevops/base:ubuntu-22.04': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.2' - - 'docker build --no-cache -t webdevops/php-dev:8.2 .' + - 'cd docker/base/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_667f1a78e9ca18.84839188' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ca18.84839188' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_67b33780215452.09106799' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780215452.09106799' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2ExOC44NDgzOTE4OCJ9 Dockerfile_667f1a78e9ca18.84839188' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE1NDUyLjA5MTA2Nzk5In0= Dockerfile_67b33780215452.09106799' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2' - - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' + - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' + - 'docker push webdevops/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' + - 'docker push webdevops/base:latest' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx:8.2': + - 'webdevops/bootstrap:ubuntu-22.04' +'webdevops/php-apache:8.1': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2' - - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' + - 'cd docker/php-apache/8.1' + - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_667f1a78e9cc28.80853000' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cc28.80853000' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_67b33780250782.57437894' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780250782.57437894' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljYzI4LjgwODUzMDAwIn0= Dockerfile_667f1a78e9cc28.80853000' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2' - - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MDc4Mi41NzQzNzg5NCJ9 Dockerfile_67b33780250782.57437894' + - 'docker push webdevops/php-apache:8.1' + - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' tags: - aws needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx-dev:8.2': - stage: level4 + - 'webdevops/php:8.1' +'webdevops/php-apache:8.1-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.2' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' + - 'cd docker/php-apache/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_667f1a78e9cf03.94640741' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cf03.94640741' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_67b3378023efa2.31447016' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023efa2.31447016' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2YwMy45NDY0MDc0MSJ9 Dockerfile_667f1a78e9cf03.94640741' - - 'docker push webdevops/php-nginx-dev:8.2' - - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2VmYTIuMzE0NDcwMTYifQ== Dockerfile_67b3378023efa2.31447016' + - 'docker push webdevops/php-apache:8.1-alpine' + - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.2' + - 'webdevops/php:8.1-alpine' 'webdevops/php-apache:8.2': stage: level3 before_script: @@ -359,10 +382,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_667f1a78e9d122.49340362' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d122.49340362' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_67b33780224f36.01642941' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780224f36.01642941' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDEyMi40OTM0MDM2MiJ9 Dockerfile_667f1a78e9d122.49340362' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNGYzNi4wMTY0Mjk0MSJ9 Dockerfile_67b33780224f36.01642941' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -370,186 +393,180 @@ stages: - aws needs: - 'webdevops/php:8.2' -'webdevops/php-apache-dev:8.2': - stage: level4 +'webdevops/php-apache:8.2-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.2' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd docker/php-apache/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_667f1a78e9d325.79477395' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d325.79477395' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_67b3378022e321.36917823' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022e321.36917823' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWQzMjUuNzk0NzczOTUifQ== Dockerfile_667f1a78e9d325.79477395' - - 'docker push webdevops/php-apache-dev:8.2' - - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmUzMjEuMzY5MTc4MjMifQ== Dockerfile_67b3378022e321.36917823' + - 'docker push webdevops/php-apache:8.2-alpine' + - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' tags: - aws needs: - - 'webdevops/php-apache:8.2' -'webdevops/php:8.3': - stage: level2 + - 'webdevops/php:8.2-alpine' +'webdevops/php-apache:8.3': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.3' - - 'docker build --no-cache -t webdevops/php:8.3 .' + - 'cd docker/php-apache/8.3' + - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_667f1a78e9d503.69654040' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d503.69654040' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_67b33780227951.29831764' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780227951.29831764' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkNTAzLjY5NjU0MDQwIn0= Dockerfile_667f1a78e9d503.69654040' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - - 'docker push webdevops/php:8.3' - - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3' - - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' - - 'docker push webdevops/php-official:8.3' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNzk1MS4yOTgzMTc2NCJ9 Dockerfile_67b33780227951.29831764' + - 'docker push webdevops/php-apache:8.3' + - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.3': + - 'webdevops/php:8.3' +'webdevops/php-apache:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.3' - - 'docker build --no-cache -t webdevops/php-dev:8.3 .' + - 'cd docker/php-apache/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_667f1a78e9d745.04130984' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d745.04130984' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_67b33780223057.11549528' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780223057.11549528' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDc0NS4wNDEzMDk4NCJ9 Dockerfile_667f1a78e9d745.04130984' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3' - - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjMwNTcuMTE1NDk1MjgifQ== Dockerfile_67b33780223057.11549528' + - 'docker push webdevops/php-apache:8.3-alpine' + - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx:8.3': + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache:8.4': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.3' - - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' + - 'cd docker/php-apache/8.4' + - 'docker build --no-cache -t webdevops/php-apache:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_667f1a78e9d9b6.72303514' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d9b6.72303514' + - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_67b33780241669.66363972' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780241669.66363972' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkOWI2LjcyMzAzNTE0In0= Dockerfile_667f1a78e9d9b6.72303514' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3' - - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MTY2OS42NjM2Mzk3MiJ9 Dockerfile_67b33780241669.66363972' + - 'docker push webdevops/php-apache:8.4' + - 'docker tag webdevops/php-apache:8.4 $CI_REGISTRY_IMAGE/php-apache:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx-dev:8.3': - stage: level4 + - 'webdevops/php:8.4' +'webdevops/php-apache:8.4-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.3' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' + - 'cd docker/php-apache/8.4-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_667f1a78e9dc76.11125850' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9dc76.11125850' + - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_67b33780221375.80839496' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780221375.80839496' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGM3Ni4xMTEyNTg1MCJ9 Dockerfile_667f1a78e9dc76.11125850' - - 'docker push webdevops/php-nginx-dev:8.3' - - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjEzNzUuODA4Mzk0OTYifQ== Dockerfile_67b33780221375.80839496' + - 'docker push webdevops/php-apache:8.4-alpine' + - 'docker tag webdevops/php-apache:8.4-alpine $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.3' -'webdevops/php-apache:8.3': + - 'webdevops/php:8.4-alpine' +'webdevops/php-dev:8.1': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.3' - - 'docker build --no-cache -t webdevops/php-apache:8.3 .' + - 'cd docker/php-dev/8.1' + - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_667f1a78e9de76.40274417' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9de76.40274417' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_67b33780250158.76524197' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780250158.76524197' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGU3Ni40MDI3NDQxNyJ9 Dockerfile_667f1a78e9de76.40274417' - - 'docker push webdevops/php-apache:8.3' - - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MDE1OC43NjUyNDE5NyJ9 Dockerfile_67b33780250158.76524197' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1' + - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' tags: - aws needs: - - 'webdevops/php:8.3' -'webdevops/php-apache-dev:8.3': - stage: level4 + - 'webdevops/php:8.1' +'webdevops/php-dev:8.1-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.3' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' + - 'cd docker/php-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_667f1a78e9e033.60561999' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9e033.60561999' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_67b3378023e319.33479644' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023e319.33479644' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWUwMzMuNjA1NjE5OTkifQ== Dockerfile_667f1a78e9e033.60561999' - - 'docker push webdevops/php-apache-dev:8.3' - - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2UzMTkuMzM0Nzk2NDQifQ== Dockerfile_67b3378023e319.33479644' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1-alpine' + - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php-apache:8.3' -'webdevops/php:8.2-alpine': - stage: level2 + - 'webdevops/php:8.1-alpine' +'webdevops/php-dev:8.2': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.2-alpine' - - 'docker build --no-cache -t webdevops/php:8.2-alpine .' + - 'cd docker/php-dev/8.2' + - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_667f1a78e9fd69.08017350' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9fd69.08017350' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_67b33780224b49.67003782' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780224b49.67003782' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZmQ2OS4wODAxNzM1MCJ9 Dockerfile_667f1a78e9fd69.08017350' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNGI0OS42NzAwMzc4MiJ9 Dockerfile_67b33780224b49.67003782' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' - - 'docker push webdevops/php-official:8.2-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2' + - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' tags: - aws needs: - - 'webdevops/toolbox:latest' + - 'webdevops/php:8.2' 'webdevops/php-dev:8.2-alpine': stage: level3 before_script: @@ -560,10 +577,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_667f1a78e9ff80.10051609' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ff80.10051609' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_67b3378022ddd1.71440200' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022ddd1.71440200' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWZmODAuMTAwNTE2MDkifQ== Dockerfile_667f1a78e9ff80.10051609' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmRkZDEuNzE0NDAyMDAifQ== Dockerfile_67b3378022ddd1.71440200' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -573,140 +590,121 @@ stages: - aws needs: - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx:8.2-alpine': +'webdevops/php-dev:8.3': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' + - 'cd docker/php-dev/8.3' + - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_667f1a78ea0223.80714897' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0223.80714897' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_67b337802273f4.20899500' + - 'echo "COPY conf/ /" >> Dockerfile_67b337802273f4.20899500' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhMDIyMy44MDcxNDg5NyJ9 Dockerfile_667f1a78ea0223.80714897' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNzNmNC4yMDg5OTUwMCJ9 Dockerfile_67b337802273f4.20899500' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2-alpine' - - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx-dev:8.2-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_667f1a78ea0482.28125239' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0482.28125239' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA0ODIuMjgxMjUyMzkifQ== Dockerfile_667f1a78ea0482.28125239' - - 'docker push webdevops/php-nginx-dev:8.2-alpine' - - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3' + - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' tags: - aws needs: - - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-apache:8.2-alpine': + - 'webdevops/php:8.3' +'webdevops/php-dev:8.3-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' + - 'cd docker/php-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_667f1a78ea06f5.64008708' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea06f5.64008708' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_67b33780222898.27776469' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780222898.27776469' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA2ZjUuNjQwMDg3MDgifQ== Dockerfile_667f1a78ea06f5.64008708' - - 'docker push webdevops/php-apache:8.2-alpine' - - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjI4OTguMjc3NzY0NjkifQ== Dockerfile_67b33780222898.27776469' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3-alpine' + - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' tags: - aws needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-apache-dev:8.2-alpine': - stage: level4 + - 'webdevops/php:8.3-alpine' +'webdevops/php-dev:8.4': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' + - 'cd docker/php-dev/8.4' + - 'docker build --no-cache -t webdevops/php-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_667f1a78ea0940.45216278' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0940.45216278' + - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_67b33780240cd3.25453164' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780240cd3.25453164' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWEwOTQwLjQ1MjE2Mjc4In0= Dockerfile_667f1a78ea0940.45216278' - - 'docker push webdevops/php-apache-dev:8.2-alpine' - - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MGNkMy4yNTQ1MzE2NCJ9 Dockerfile_67b33780240cd3.25453164' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.4' + - 'docker tag webdevops/php-dev:8.4 $CI_REGISTRY_IMAGE/php-dev:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4' tags: - aws needs: - - 'webdevops/php-apache:8.2-alpine' -'webdevops/php:8.1-alpine': - stage: level2 + - 'webdevops/php:8.4' +'webdevops/php-dev:8.4-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.1-alpine' - - 'docker build --no-cache -t webdevops/php:8.1-alpine .' + - 'cd docker/php-dev/8.4-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_667f1a78ea5481.67757977' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5481.67757977' + - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_67b33780221096.32273434' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780221096.32273434' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNTQ4MS42Nzc1Nzk3NyJ9 Dockerfile_667f1a78ea5481.67757977' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjEwOTYuMzIyNzM0MzQifQ== Dockerfile_67b33780221096.32273434' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - - 'docker push webdevops/php-official:8.1-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.4-alpine' + - 'docker tag webdevops/php-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.1-alpine': + - 'webdevops/php:8.4-alpine' +'webdevops/php-nginx:8.1': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' + - 'cd docker/php-nginx/8.1' + - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_667f1a78ea57d7.69758972' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea57d7.69758972' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_67b33780251289.29081473' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780251289.29081473' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTU3ZDcuNjk3NTg5NzIifQ== Dockerfile_667f1a78ea57d7.69758972' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjUxMjg5LjI5MDgxNDczIn0= Dockerfile_67b33780251289.29081473' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1-alpine' - - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1' + - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' tags: - aws needs: - - 'webdevops/php:8.1-alpine' + - 'webdevops/php:8.1' 'webdevops/php-nginx:8.1-alpine': stage: level3 before_script: @@ -717,10 +715,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_667f1a78ea5ad9.12373386' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5ad9.12373386' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_67b3378023f6b7.58331226' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023f6b7.58331226' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNWFkOS4xMjM3MzM4NiJ9 Dockerfile_667f1a78ea5ad9.12373386' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIzZjZiNy41ODMzMTIyNiJ9 Dockerfile_67b3378023f6b7.58331226' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -730,274 +728,402 @@ stages: - aws needs: - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx-dev:8.1-alpine': - stage: level4 +'webdevops/php-nginx:8.2': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' + - 'cd docker/php-nginx/8.2' + - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_667f1a78ea5df7.88542972' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5df7.88542972' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_67b33780225875.98479028' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780225875.98479028' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTVkZjcuODg1NDI5NzIifQ== Dockerfile_667f1a78ea5df7.88542972' - - 'docker push webdevops/php-nginx-dev:8.1-alpine' - - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI1ODc1Ljk4NDc5MDI4In0= Dockerfile_67b33780225875.98479028' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2' + - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' tags: - aws needs: - - 'webdevops/php-nginx:8.1-alpine' -'webdevops/php-apache:8.1-alpine': + - 'webdevops/php:8.2' +'webdevops/php-nginx:8.2-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' + - 'cd docker/php-nginx/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_667f1a78ea60d4.57421920' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea60d4.57421920' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_67b3378022eb39.08525303' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022eb39.08525303' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTYwZDQuNTc0MjE5MjAifQ== Dockerfile_667f1a78ea60d4.57421920' - - 'docker push webdevops/php-apache:8.1-alpine' - - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyZWIzOS4wODUyNTMwMyJ9 Dockerfile_67b3378022eb39.08525303' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2-alpine' + - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' tags: - aws needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache-dev:8.1-alpine': - stage: level4 + - 'webdevops/php:8.2-alpine' +'webdevops/php-nginx:8.3': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' + - 'cd docker/php-nginx/8.3' + - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_667f1a78ea6379.68528757' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea6379.68528757' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_67b33780228964.55110588' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780228964.55110588' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE2Mzc5LjY4NTI4NzU3In0= Dockerfile_667f1a78ea6379.68528757' - - 'docker push webdevops/php-apache-dev:8.1-alpine' - - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI4OTY0LjU1MTEwNTg4In0= Dockerfile_67b33780228964.55110588' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3' + - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' tags: - aws needs: - - 'webdevops/php-apache:8.1-alpine' -'webdevops/php:8.3-alpine': - stage: level2 + - 'webdevops/php:8.3' +'webdevops/php-nginx:8.3-alpine': + stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.3-alpine' - - 'docker build --no-cache -t webdevops/php:8.3-alpine .' + - 'cd docker/php-nginx/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_667f1a78ea8b41.81742789' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8b41.81742789' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_67b33780223ba0.87435473' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780223ba0.87435473' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOGI0MS44MTc0Mjc4OSJ9 Dockerfile_667f1a78ea8b41.81742789' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyM2JhMC44NzQzNTQ3MyJ9 Dockerfile_67b33780223ba0.87435473' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' - - 'docker push webdevops/php-official:8.3-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3-alpine' + - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.3-alpine': + - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx:8.4': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' + - 'cd docker/php-nginx/8.4' + - 'docker build --no-cache -t webdevops/php-nginx:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_667f1a78ea8e30.16387680' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8e30.16387680' + - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_67b33780242328.62344667' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780242328.62344667' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYThlMzAuMTYzODc2ODAifQ== Dockerfile_667f1a78ea8e30.16387680' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjQyMzI4LjYyMzQ0NjY3In0= Dockerfile_67b33780242328.62344667' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3-alpine' - - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.4' + - 'docker tag webdevops/php-nginx:8.4 $CI_REGISTRY_IMAGE/php-nginx:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4' tags: - aws needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-nginx:8.3-alpine': + - 'webdevops/php:8.4' +'webdevops/php-nginx:8.4-alpine': stage: level3 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' + - 'cd docker/php-nginx/8.4-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_667f1a78ea90c7.39536377' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea90c7.39536377' + - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_67b337802218e8.90240500' + - 'echo "COPY conf/ /" >> Dockerfile_67b337802218e8.90240500' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOTBjNy4zOTUzNjM3NyJ9 Dockerfile_667f1a78ea90c7.39536377' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMThlOC45MDI0MDUwMCJ9 Dockerfile_67b337802218e8.90240500' - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3-alpine' - - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.4-alpine' + - 'docker tag webdevops/php-nginx:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' tags: - aws needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-nginx-dev:8.3-alpine': + - 'webdevops/php:8.4-alpine' +'webdevops/apache:alpine': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd docker/apache/alpine' + - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_667f1a78ea9382.50928096' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9382.50928096' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_67b33780217d18.60871477' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780217d18.60871477' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTkzODIuNTA5MjgwOTYifQ== Dockerfile_667f1a78ea9382.50928096' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE3ZDE4LjYwODcxNDc3In0= Dockerfile_67b33780217d18.60871477' + - 'docker push webdevops/apache:alpine' + - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' + - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' tags: - aws needs: - - 'webdevops/php-nginx:8.3-alpine' -'webdevops/php-apache:8.3-alpine': - stage: level3 + - 'webdevops/base:alpine' +'webdevops/base-app:alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' + - 'cd docker/base-app/alpine' + - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_667f1a78ea9618.83273110' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9618.83273110' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_67b337802174b9.60734934' + - 'echo "COPY conf/ /" >> Dockerfile_67b337802174b9.60734934' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTk2MTguODMyNzMxMTAifQ== Dockerfile_667f1a78ea9618.83273110' - - 'docker push webdevops/php-apache:8.3-alpine' - - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTc0YjkuNjA3MzQ5MzQifQ== Dockerfile_67b337802174b9.60734934' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' + - 'docker push webdevops/base-app:alpine' + - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' tags: - aws needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-apache-dev:8.3-alpine': + - 'webdevops/base:alpine' +'webdevops/base-app:ubuntu-22.04': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' + - 'cd docker/base-app/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_667f1a78ea98a5.83179491' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea98a5.83179491' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_67b33780215755.05460809' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780215755.05460809' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5OGE1LjgzMTc5NDkxIn0= Dockerfile_667f1a78ea98a5.83179491' - - 'docker push webdevops/php-apache-dev:8.3-alpine' - - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNTc1NS4wNTQ2MDgwOSJ9 Dockerfile_67b33780215755.05460809' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' + - 'docker push webdevops/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' + - 'docker push webdevops/base-app:latest' tags: - aws needs: - - 'webdevops/php-apache:8.3-alpine' -'webdevops/php:8.1': - stage: level2 + - 'webdevops/base:ubuntu-22.04' +'webdevops/nginx:alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-official/8.1' - - 'docker build --no-cache -t webdevops/php:8.1 .' + - 'cd docker/nginx/alpine' + - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_667f1a78ea9b24.63300881' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9b24.63300881' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_67b33780217a03.35196981' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780217a03.35196981' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5YjI0LjYzMzAwODgxIn0= Dockerfile_667f1a78ea9b24.63300881' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - - 'docker push webdevops/php:8.1' - - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1' - - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' - - 'docker push webdevops/php-official:8.1' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTdhMDMuMzUxOTY5ODEifQ== Dockerfile_67b33780217a03.35196981' + - 'docker push webdevops/nginx:alpine' + - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' + - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' tags: - aws needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.1': - stage: level3 + - 'webdevops/base:alpine' +'webdevops/php-apache-dev:8.1': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-dev/8.1' - - 'docker build --no-cache -t webdevops/php-dev:8.1 .' + - 'cd docker/php-apache-dev/8.1' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_667f1a78ea9e21.36207680' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9e21.36207680' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_67b33780250ae3.80578672' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780250ae3.80578672' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOWUyMS4zNjIwNzY4MCJ9 Dockerfile_667f1a78ea9e21.36207680' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1' - - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyNTBhZTMuODA1Nzg2NzIifQ== Dockerfile_67b33780250ae3.80578672' + - 'docker push webdevops/php-apache-dev:8.1' + - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' tags: - aws needs: - - 'webdevops/php:8.1' -'webdevops/php-nginx:8.1': - stage: level3 + - 'webdevops/php-apache:8.1' +'webdevops/php-apache-dev:8.1-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-nginx/8.1' - - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' + - 'cd docker/php-apache-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_667f1a78eaa153.04305152' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa153.04305152' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_67b3378023f371.12517127' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023f371.12517127' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWFhMTUzLjA0MzA1MTUyIn0= Dockerfile_667f1a78eaa153.04305152' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1' - - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjNmMzcxLjEyNTE3MTI3In0= Dockerfile_67b3378023f371.12517127' + - 'docker push webdevops/php-apache-dev:8.1-alpine' + - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php:8.1' + - 'webdevops/php-apache:8.1-alpine' +'webdevops/php-apache-dev:8.2': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.2' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_67b33780225200.47918817' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780225200.47918817' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjUyMDAuNDc5MTg4MTcifQ== Dockerfile_67b33780225200.47918817' + - 'docker push webdevops/php-apache-dev:8.2' + - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php-apache:8.2' +'webdevops/php-apache-dev:8.2-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_67b3378022e691.08109699' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022e691.08109699' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjJlNjkxLjA4MTA5Njk5In0= Dockerfile_67b3378022e691.08109699' + - 'docker push webdevops/php-apache-dev:8.2-alpine' + - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.2-alpine' +'webdevops/php-apache-dev:8.3': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_67b33780228158.19260488' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780228158.19260488' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjgxNTguMTkyNjA0ODgifQ== Dockerfile_67b33780228158.19260488' + - 'docker push webdevops/php-apache-dev:8.3' + - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3' +'webdevops/php-apache-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_67b337802235a8.44153401' + - 'echo "COPY conf/ /" >> Dockerfile_67b337802235a8.44153401' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjIzNWE4LjQ0MTUzNDAxIn0= Dockerfile_67b337802235a8.44153401' + - 'docker push webdevops/php-apache-dev:8.3-alpine' + - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3-alpine' +'webdevops/php-apache-dev:8.4': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.4' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.4 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_67b33780241c27.57841892' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780241c27.57841892' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyNDFjMjcuNTc4NDE4OTIifQ== Dockerfile_67b33780241c27.57841892' + - 'docker push webdevops/php-apache-dev:8.4' + - 'docker tag webdevops/php-apache-dev:8.4 $CI_REGISTRY_IMAGE/php-apache-dev:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4' + tags: + - aws + needs: + - 'webdevops/php-apache:8.4' +'webdevops/php-apache-dev:8.4-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.4-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.4-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_67b33780221629.96682056' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780221629.96682056' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjIxNjI5Ljk2NjgyMDU2In0= Dockerfile_67b33780221629.96682056' + - 'docker push webdevops/php-apache-dev:8.4-alpine' + - 'docker tag webdevops/php-apache-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.4-alpine' 'webdevops/php-nginx-dev:8.1': stage: level4 before_script: @@ -1008,10 +1134,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_667f1a78eaa4e0.42729575' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa4e0.42729575' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_67b33780252b32.59774074' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780252b32.59774074' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTRlMC40MjcyOTU3NSJ9 Dockerfile_667f1a78eaa4e0.42729575' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MmIzMi41OTc3NDA3NCJ9 Dockerfile_67b33780252b32.59774074' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -1019,45 +1145,187 @@ stages: - aws needs: - 'webdevops/php-nginx:8.1' -'webdevops/php-apache:8.1': - stage: level3 +'webdevops/php-nginx-dev:8.1-alpine': + stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache/8.1' - - 'docker build --no-cache -t webdevops/php-apache:8.1 .' + - 'cd docker/php-nginx-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_667f1a78eaa807.54530156' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa807.54530156' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_67b3378023ff46.25105637' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378023ff46.25105637' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTgwNy41NDUzMDE1NiJ9 Dockerfile_667f1a78eaa807.54530156' - - 'docker push webdevops/php-apache:8.1' - - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2ZmNDYuMjUxMDU2MzcifQ== Dockerfile_67b3378023ff46.25105637' + - 'docker push webdevops/php-nginx-dev:8.1-alpine' + - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' tags: - aws needs: - - 'webdevops/php:8.1' -'webdevops/php-apache-dev:8.1': + - 'webdevops/php-nginx:8.1-alpine' +'webdevops/php-nginx-dev:8.2': stage: level4 before_script: - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' image: webdevops/dockerfile-build-env script: - - 'cd docker/php-apache-dev/8.1' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' + - 'cd docker/php-nginx-dev/8.2' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_667f1a78eaac02.87762131' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaac02.87762131' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_67b33780226136.74226750' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780226136.74226750' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYWFjMDIuODc3NjIxMzEifQ== Dockerfile_667f1a78eaac02.87762131' - - 'docker push webdevops/php-apache-dev:8.1' - - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNjEzNi43NDIyNjc1MCJ9 Dockerfile_67b33780226136.74226750' + - 'docker push webdevops/php-nginx-dev:8.2' + - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' tags: - aws needs: - - 'webdevops/php-apache:8.1' + - 'webdevops/php-nginx:8.2' +'webdevops/php-nginx-dev:8.2-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_67b3378022f051.78820010' + - 'echo "COPY conf/ /" >> Dockerfile_67b3378022f051.78820010' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmYwNTEuNzg4MjAwMTAifQ== Dockerfile_67b3378022f051.78820010' + - 'docker push webdevops/php-nginx-dev:8.2-alpine' + - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.2-alpine' +'webdevops/php-nginx-dev:8.3': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_67b33780228f64.03329939' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780228f64.03329939' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyOGY2NC4wMzMyOTkzOSJ9 Dockerfile_67b33780228f64.03329939' + - 'docker push webdevops/php-nginx-dev:8.3' + - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3' +'webdevops/php-nginx-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_67b33780223fe6.79212619' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780223fe6.79212619' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjNmZTYuNzkyMTI2MTkifQ== Dockerfile_67b33780223fe6.79212619' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3-alpine' +'webdevops/php-nginx-dev:8.4': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.4' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_67b33780242ab9.24601667' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780242ab9.24601667' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MmFiOS4yNDYwMTY2NyJ9 Dockerfile_67b33780242ab9.24601667' + - 'docker push webdevops/php-nginx-dev:8.4' + - 'docker tag webdevops/php-nginx-dev:8.4 $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.4' +'webdevops/php-nginx-dev:8.4-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.4-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_67b33780221c39.77304607' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780221c39.77304607' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjFjMzkuNzczMDQ2MDcifQ== Dockerfile_67b33780221c39.77304607' + - 'docker push webdevops/php-nginx-dev:8.4-alpine' + - 'docker tag webdevops/php-nginx-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.4-alpine' +'webdevops/vsftp:latest': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/vsftp/latest' + - 'docker build --no-cache -t webdevops/vsftp:latest .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_67b33780216706.35505941' + - 'echo "COPY conf/ /" >> Dockerfile_67b33780216706.35505941' + - 'bundle install' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNjcwNi4zNTUwNTk0MSJ9 Dockerfile_67b33780216706.35505941' + - 'docker push webdevops/vsftp:latest' + - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' + - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' + tags: + - aws + needs: + - 'webdevops/base:ubuntu-22.04' +'webdevops/dockerfile-build-env:latest': + stage: level5 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/dockerfile-build-env/latest' + - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' + - 'docker push webdevops/dockerfile-build-env:latest' + - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + tags: + - aws + needs: + - 'webdevops/base-app:ubuntu-22.04' diff --git a/README.md b/README.md index 027df1a8b..07a5210e8 100644 --- a/README.md +++ b/README.md @@ -46,11 +46,11 @@ config files from the `provisioning` directory. We generate a multi stage Gitlab-CI configuration using PHP: ``` -docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.1 composer install -docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.1 ci/console gitlab:generate +docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.3-alpine composer install +docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.3-alpine ci/console gitlab:generate ``` -Gitlab CI builds every image independant and runs serverspec and structure tests on every +Gitlab CI builds every image independent and runs serverspec and structure tests on every image before pushing them to the registry. ## Documentation @@ -68,26 +68,32 @@ The following images which are currently supported are based on `php:{VER}-fpm-b * `webdevops/php:8.1` * `webdevops/php:8.2` * `webdevops/php:8.3` +* `webdevops/php:8.4` * `webdevops/php-dev:8.0` * `webdevops/php-dev:8.1` * `webdevops/php-dev:8.2` * `webdevops/php-dev:8.3` +* `webdevops/php-dev:8.4` * `webdevops/php-apache:8.0` * `webdevops/php-apache:8.1` * `webdevops/php-apache:8.2` * `webdevops/php-apache:8.3` +* `webdevops/php-apache:8.4` * `webdevops/php-apache-dev:8.0` * `webdevops/php-apache-dev:8.1` * `webdevops/php-apache-dev:8.2` * `webdevops/php-apache-dev:8.3` +* `webdevops/php-apache-dev:8.4` * `webdevops/php-nginx:8.0` * `webdevops/php-nginx:8.1` * `webdevops/php-nginx:8.2` * `webdevops/php-nginx:8.3` +* `webdevops/php-nginx:8.4` * `webdevops/php-nginx-dev:8.0` * `webdevops/php-nginx-dev:8.1` * `webdevops/php-nginx-dev:8.2` * `webdevops/php-nginx-dev:8.3` +* `webdevops/php-nginx-dev:8.4` ### Alpine PHP @@ -98,23 +104,29 @@ The following images which are currently supported are based on `php:{VER}-fpm-a * `webdevops/php:8.1-alpine` * `webdevops/php:8.2-alpine` * `webdevops/php:8.3-alpine` +* `webdevops/php:8.4-alpine` * `webdevops/php-dev:8.0-alpine` * `webdevops/php-dev:8.1-alpine` * `webdevops/php-dev:8.2-alpine` * `webdevops/php-dev:8.3-alpine` +* `webdevops/php-dev:8.4-alpine` * `webdevops/php-apache:8.0-alpine` * `webdevops/php-apache:8.1-alpine` * `webdevops/php-apache:8.2-alpine` * `webdevops/php-apache:8.3-alpine` +* `webdevops/php-apache:8.4-alpine` * `webdevops/php-apache-dev:8.0-alpine` * `webdevops/php-apache-dev:8.1-alpine` * `webdevops/php-apache-dev:8.2-alpine` * `webdevops/php-apache-dev:8.3-alpine` +* `webdevops/php-apache-dev:8.4-alpine` * `webdevops/php-nginx:8.0-alpine` * `webdevops/php-nginx:8.1-alpine` * `webdevops/php-nginx:8.2-alpine` * `webdevops/php-nginx:8.3-alpine` +* `webdevops/php-nginx:8.4-alpine` * `webdevops/php-nginx-dev:8.0-alpine` * `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` * `webdevops/php-nginx-dev:8.3-alpine` +* `webdevops/php-nginx-dev:8.4-alpine` diff --git a/build-local.sh b/build-local.sh new file mode 100755 index 000000000..89eec063c --- /dev/null +++ b/build-local.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -exuo pipefail + +ROOT_DIR=$(pwd) +PHP_VERSION=8.4 + +#docker run --rm -ti -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision + +# if first parameter is present overwrite php version + make sanity check + +if [ "$#" -gt 0 ]; then + PHP_VERSION=$1 + if [ ! -d "$ROOT_DIR/docker/php/$PHP_VERSION" ]; then + echo "PHP version $PHP_VERSION not found" + exit 1 + fi +fi + +# alpine +cd $ROOT_DIR/docker/php/$PHP_VERSION-alpine +docker build -t webdevops/php:$PHP_VERSION-alpine . +cd $ROOT_DIR/docker/php-dev/$PHP_VERSION-alpine +docker build -t webdevops/php-dev:$PHP_VERSION-alpine . + +cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION-alpine +docker build -t webdevops/php-nginx:$PHP_VERSION-alpine . +cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION-alpine +docker build -t webdevops/php-nginx-dev:$PHP_VERSION-alpine . + +cd $ROOT_DIR/docker/php-apache/$PHP_VERSION-alpine +docker build -t webdevops/php-apache:$PHP_VERSION-alpine . +cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION-alpine +docker build -t webdevops/php-apache-dev:$PHP_VERSION-alpine . + +# debian +cd $ROOT_DIR/docker/php/$PHP_VERSION +docker build -t webdevops/php:$PHP_VERSION . +cd $ROOT_DIR/docker/php-dev/$PHP_VERSION +docker build -t webdevops/php-dev:$PHP_VERSION . + +cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION +docker build -t webdevops/php-nginx:$PHP_VERSION . +cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION +docker build -t webdevops/php-nginx-dev:$PHP_VERSION . + +cd $ROOT_DIR/docker/php-apache/$PHP_VERSION +docker build -t webdevops/php-apache:$PHP_VERSION . +cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION +docker build -t webdevops/php-apache-dev:$PHP_VERSION . + +docker images | grep webdevops | grep $PHP_VERSION diff --git a/ci/src/Commands/GitlabCommand.php b/ci/src/Commands/GitlabCommand.php index 82d7ef735..a87caddd0 100644 --- a/ci/src/Commands/GitlabCommand.php +++ b/ci/src/Commands/GitlabCommand.php @@ -46,6 +46,12 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->traverse($rootNode); } $gitlabCi['stages'] = array_map(function($level) {return 'level' . $level;}, range(1, $this->deepestLevel)); + + ksort($this->jobs); // system independent order of jobs (sorted by stage) + uasort($this->jobs, function($a, $b) { + return $a['stage'] <=> $b['stage']; + }); + $yaml = Yaml::dump(array_merge($gitlabCi, $this->jobs), 3, 2); file_put_contents(__DIR__ . '/../../../.gitlab-ci.yml', $yaml); return 0; diff --git a/conf/console.yml b/conf/console.yml index a5f536a12..5dce68647 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,7 +43,7 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php[^:]*:8.(0|1|2|3)': + 'php[^:]*:8.(0|1|2|3|4)': OS_FAMILY: 'debian' OS_VERSION: '12' PHP_OFFICIAL: '1' diff --git a/docker/php-apache-dev/8.4-alpine/Dockerfile b/docker/php-apache-dev/8.4-alpine/Dockerfile new file mode 100644 index 000000000..ebd1dfcf9 --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.4-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.4-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..1d42777aa --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-apache", "8.4-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.4") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/8.4/Dockerfile b/docker/php-apache-dev/8.4/Dockerfile new file mode 100644 index 000000000..fdd8531c0 --- /dev/null +++ b/docker/php-apache-dev/8.4/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.4 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.4/Dockerfile.jinja2 b/docker/php-apache-dev/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..28eb4ec05 --- /dev/null +++ b/docker/php-apache-dev/8.4/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.4") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.4") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/8.4-alpine/Dockerfile b/docker/php-apache/8.4-alpine/Dockerfile new file mode 100644 index 000000000..af7842c3b --- /dev/null +++ b/docker/php-apache/8.4-alpine/Dockerfile @@ -0,0 +1,33 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apk-install \ + apache2 \ + apache2-ctl \ + apache2-utils \ + apache2-proxy \ + apache2-ssl \ + # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) + && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/httpd.conf \ + && docker-run-bootstrap + +EXPOSE 80 443 diff --git a/docker/php-apache/8.4-alpine/Dockerfile.jinja2 b/docker/php-apache/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..aeb26b9a1 --- /dev/null +++ b/docker/php-apache/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "8.4-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.alpine() }} \ + {{ provision.runBootstrap() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f88544c62 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/8.4/Dockerfile b/docker/php-apache/8.4/Dockerfile new file mode 100644 index 000000000..fada78fa5 --- /dev/null +++ b/docker/php-apache/8.4/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apt-install \ + apache2 \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.4/Dockerfile.jinja2 b/docker/php-apache/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..dd8ec549b --- /dev/null +++ b/docker/php-apache/8.4/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.4") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.debian12() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.4/conf/bin/service.d/httpd.sh b/docker/php-apache/8.4/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..1d871e7ea --- /dev/null +++ b/docker/php-apache/8.4/conf/bin/service.d/httpd.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.4/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.4/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.4/conf/etc/httpd/global.conf b/docker/php-apache/8.4/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.4/conf/etc/httpd/main.conf b/docker/php-apache/8.4/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.4/conf/etc/httpd/php.conf b/docker/php-apache/8.4/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.4/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.4/conf/etc/httpd/vhost.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.4/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.4/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-dev/8.4-alpine/Dockerfile b/docker/php-dev/8.4-alpine/Dockerfile new file mode 100644 index 000000000..02d2db188 --- /dev/null +++ b/docker/php-dev/8.4-alpine/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4-alpine + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-dev/8.4-alpine/Dockerfile.jinja2 b/docker/php-dev/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..1d7d6d5a6 --- /dev/null +++ b/docker/php-dev/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "8.4-alpine") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.4") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.4-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.4-alpine/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.4/Dockerfile b/docker/php-dev/8.4/Dockerfile new file mode 100644 index 000000000..247a6d0ac --- /dev/null +++ b/docker/php-dev/8.4/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.4/Dockerfile.jinja2 b/docker/php-dev/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..a464e5f8c --- /dev/null +++ b/docker/php-dev/8.4/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.4") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.4") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.4-alpine/Dockerfile b/docker/php-nginx-dev/8.4-alpine/Dockerfile new file mode 100644 index 000000000..a30de995d --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.4-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..4170b720f --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-nginx", "8.4-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/8.4/Dockerfile b/docker/php-nginx-dev/8.4/Dockerfile new file mode 100644 index 000000000..3c122ffa1 --- /dev/null +++ b/docker/php-nginx-dev/8.4/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.4 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.4/Dockerfile.jinja2 b/docker/php-nginx-dev/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..12045f721 --- /dev/null +++ b/docker/php-nginx-dev/8.4/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.4") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.4") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/8.4-alpine/Dockerfile b/docker/php-nginx/8.4-alpine/Dockerfile new file mode 100644 index 000000000..ffec138e3 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && apk-install \ + nginx \ + && docker-run-bootstrap + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.4-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..e916082f0 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.4-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.alpine() }} \ + {{ provision.runBootstrap() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..b9cb4ebc4 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf @@ -0,0 +1,34 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /docker.stdout; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /docker.stdout main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..b4df6d710 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,6 @@ +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/8.4/Dockerfile b/docker/php-nginx/8.4/Dockerfile new file mode 100644 index 000000000..7b37e5d81 --- /dev/null +++ b/docker/php-nginx/8.4/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.4 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + >> /etc/apt/sources.list \ + && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.4/Dockerfile.jinja2 b/docker/php-nginx/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..96ac60a31 --- /dev/null +++ b/docker/php-nginx/8.4/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.4") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.4/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.4/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.4/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.4/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.4/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.4/conf/etc/nginx/global.conf b/docker/php-nginx/8.4/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.4/conf/etc/nginx/main.conf b/docker/php-nginx/8.4/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.4/conf/etc/nginx/php.conf b/docker/php-nginx/8.4/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..b4df6d710 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.4/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,6 @@ +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.4/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.4/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index de0ae802e..99db5a589 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 2afcbbe5e..d606d24f4 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 596a50964..6a071c5f1 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 63dd135cc..1571618ad 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 7c68e01ff..c3d168612 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 39e9ae72f..032d57bc7 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -96,7 +96,7 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ + librabbitmq4 \ libldap-2.4-2 \ zlibc \ libxslt1.1 \ diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile new file mode 100644 index 000000000..a61b0fa45 --- /dev/null +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -0,0 +1,251 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.4-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.4-fpm-alpine + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + # Add community + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ + # System update + && /usr/local/bin/apk-upgrade \ + # Install base stuff + && apk-install \ + bash \ + ca-certificates \ + openssl \ + && update-ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ + ## Fix su execution (eg for tests) + && mkdir -p /etc/pam.d/ \ + && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su + +RUN set -x \ + # Install services + && chmod +x /opt/docker/bin/* \ + && apk-install \ + supervisor \ + wget \ + curl \ + vim \ + sed \ + tzdata \ + busybox-suid \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap + +RUN set -x \ + && apk-install shadow \ + && apk-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + drill \ + ldns \ + openssh-client \ + rsync \ + patch \ + git \ + && docker-run-bootstrap + +RUN set -x \ + # Install php environment + && apk-install \ + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + pngcrush \ + optipng \ + pngquant \ + vips \ + rabbitmq-c \ + c-client \ + # Libraries + libldap \ + icu-libs \ + libintl \ + libpq \ + libxslt \ + libgomp \ + libzip \ + libmemcached \ + yaml \ + # Build dependencies + linux-headers \ + autoconf \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + imagemagick-dev \ + rabbitmq-c-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # https://github.com/docker-library/php/issues/240 + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + ftp \ + gmp \ + ffi \ + imagick \ + amqp \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Install extensions for PHP 7.x + # Memcached for 7.3 can currently only be built from master + && MEMCACHED="`mktemp -d`" \ + && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ + && docker-php-ext-configure $MEMCACHED \ + && docker-php-ext-install $MEMCACHED \ + && rm -rf $MEMCACHED \ + && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ + && pecl install vips \ + && pecl install yaml \ + && pecl install redis \ + && pecl install mongodb \ + && pecl install xmlrpc-1.0.0RC3 \ + && docker-php-ext-enable \ + apcu \ + excimer \ + opentelemetry \ + protobuf \ + vips \ + yaml \ + redis \ + xmlrpc \ + imagick \ + mongodb \ + # Uninstall dev and header packages + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + rabbitmq-c-dev \ + imagemagick-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.4-alpine/Dockerfile.jinja2 b/docker/php-official/8.4-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..1a5f38a74 --- /dev/null +++ b/docker/php-official/8.4-alpine/Dockerfile.jinja2 @@ -0,0 +1,35 @@ + +{{ docker.fromOfficial("php", "8.4-fpm-alpine") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} +{{ environment.phpAlpineIconvWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.alpine('3.20') }} + +RUN set -x \ + {{ base.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ baseapp.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ php.officialAlpine(version='8.4') }} \ + {{ provision.runBootstrap() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.4-alpine/conf/VERSION b/docker/php-official/8.4-alpine/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.4-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.4-alpine/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.4-alpine/conf/bin/config.sh b/docker/php-official/8.4-alpine/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.4-alpine/conf/bin/control.sh b/docker/php-official/8.4-alpine/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.4-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.4-alpine/conf/bin/provision b/docker/php-official/8.4-alpine/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.4-alpine/conf/bin/provision.py b/docker/php-official/8.4-alpine/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..5af135768 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/service b/docker/php-official/8.4-alpine/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/etc/php/php.ini b/docker/php-official/8.4-alpine/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.4-alpine/conf/provision/ansible.cfg b/docker/php-official/8.4-alpine/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..7a7b42f6b --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Add group +addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" + diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..71caa48d3 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu|Alpine) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..df40ec25e --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.4-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.4-alpine/conf/provision/variables.yml b/docker/php-official/8.4-alpine/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.4-alpine/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile new file mode 100644 index 000000000..c66e6d2b6 --- /dev/null +++ b/docker/php-official/8.4/Dockerfile @@ -0,0 +1,229 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.4 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.4-fpm-bookworm + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + gnupg + +RUN set -x \ + # Install packages + && chmod +x /opt/docker/bin/* \ + && apt-install \ + supervisor \ + wget \ + curl \ + vim \ + net-tools \ + tzdata \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install services + && apt-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + patch \ + && /usr/local/bin/generate-locales \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + libjpeg-turbo-progs \ + pngcrush \ + optipng \ + apngopt \ + pngnq \ + pngquant \ + # Libraries + libvips42 \ + librabbitmq4 \ + libldap-2.5-0 \ + libxslt1.1 \ + libldap-common \ + zlib1g \ + libpq5 \ + libpng16-16 \ + libmcrypt4 \ + libzip4 \ + # Dev and headers + libjpeg62-turbo-dev \ + libwebp-dev \ + libfreetype6-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + libc-client-dev \ + libc-client2007e-dev \ + libkrb5-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + amqp \ + imagick \ + ffi \ + bz2 \ + calendar \ + exif \ + ftp \ + gmp \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + && pecl install memcached \ + && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ + && pecl install xmlrpc-1.0.0RC3 \ + && pecl install vips \ + && pecl install redis \ + && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libc-client-dev \ + libkrb5-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng-dev \ + libwebp-dev \ + libpq-dev \ + libzip-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.4/Dockerfile.jinja2 b/docker/php-official/8.4/Dockerfile.jinja2 new file mode 100644 index 000000000..61f6582f4 --- /dev/null +++ b/docker/php-official/8.4/Dockerfile.jinja2 @@ -0,0 +1,37 @@ + +{{ docker.fromOfficial("php", "8.4-fpm-bookworm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.debian('bookworm') }} + +RUN set -x \ + {{ base.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.official(version='8.4',distribution='bookworm') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.4/conf/VERSION b/docker/php-official/8.4/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.4/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.4/conf/bin/bootstrap.sh b/docker/php-official/8.4/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.4/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.4/conf/bin/config.sh b/docker/php-official/8.4/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.4/conf/bin/control.sh b/docker/php-official/8.4/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.4/conf/bin/entrypoint.sh b/docker/php-official/8.4/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.4/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.4/conf/bin/provision b/docker/php-official/8.4/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.4/conf/bin/provision.py b/docker/php-official/8.4/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.4/conf/bin/service.d/cron.sh b/docker/php-official/8.4/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..b5fa80dd3 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.4/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.4/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.4/conf/bin/service.d/postfix.sh b/docker/php-official/8.4/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.4/conf/bin/service.d/ssh.sh b/docker/php-official/8.4/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.4/conf/bin/service.d/supervisor.sh b/docker/php-official/8.4/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-provision b/docker/php-official/8.4/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service b/docker/php-official/8.4/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.4/conf/bin/usr-bin/service b/docker/php-official/8.4/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.4/conf/bin/usr-bin/version-compare b/docker/php-official/8.4/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.4/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.4/conf/etc/cron/.gitkeep b/docker/php-official/8.4/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.4/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/etc/php/php.ini b/docker/php-official/8.4/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.4/conf/etc/php/php.webdevops.ini b/docker/php-official/8.4/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.4/conf/etc/supervisor.conf b/docker/php-official/8.4/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.4/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.4/conf/provision/ansible.cfg b/docker/php-official/8.4/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..5bc865e80 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Add group +groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" + +# Assign user to group +usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..c1e716300 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..df40ec25e --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.4/conf/provision/build.d/.gitkeep b/docker/php-official/8.4/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.4/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.4/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/roles/.gitkeep b/docker/php-official/8.4/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/service.d/.gitkeep b/docker/php-official/8.4/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.4/conf/provision/service.d/cron.sh b/docker/php-official/8.4/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.4/conf/provision/service.d/postfix.sh b/docker/php-official/8.4/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.4/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.4/conf/provision/service.d/ssh.sh b/docker/php-official/8.4/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.4/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.4/conf/provision/service.d/syslog.sh b/docker/php-official/8.4/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.4/conf/provision/variables-webdevops.yml b/docker/php-official/8.4/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.4/conf/provision/variables.yml b/docker/php-official/8.4/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.4/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.3-alpine b/docker/php/8.3-alpine index 66e9a3575..bce304294 120000 --- a/docker/php/8.3-alpine +++ b/docker/php/8.3-alpine @@ -1 +1 @@ -../php-official/8.3-alpine/ \ No newline at end of file +../php-official/8.3-alpine \ No newline at end of file diff --git a/docker/php/8.4 b/docker/php/8.4 new file mode 120000 index 000000000..59c4a3067 --- /dev/null +++ b/docker/php/8.4 @@ -0,0 +1 @@ +../php-official/8.4 \ No newline at end of file diff --git a/docker/php/8.4-alpine b/docker/php/8.4-alpine new file mode 120000 index 000000000..fbb811dfd --- /dev/null +++ b/docker/php/8.4-alpine @@ -0,0 +1 @@ +../php-official/8.4-alpine \ No newline at end of file diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index b05c4df19..a7f2bb797 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -11,6 +11,7 @@ Tag Distribution name PHP Version ``8.1`` *customized official php image* PHP 8.1 ``8.2`` *customized official php image* PHP 8.2 ``8.3`` *customized official php image* PHP 8.3 +``8.4`` *customized official php image* PHP 8.4 ``7.1-alpine`` *deprecated* PHP 7.1 ``7.2-alpine`` *deprecated* PHP 7.2 ``7.3-alpine`` *deprecated* PHP 7.3 @@ -19,6 +20,7 @@ Tag Distribution name PHP Version ``8.1-alpine`` *customized official php image* PHP 8.1 ``8.2-alpine`` *customized official php image* PHP 8.2 ``8.3-alpine`` *customized official php image* PHP 8.3 +``8.4-alpine`` *customized official php image* PHP 8.4 ``alpine`` *deprecated* PHP 7.x ``alpine-php7`` *deprecated* PHP 7.x ``alpine-php5`` *deprecated* PHP 5.6 diff --git a/old.gitlab-ci.yml b/old.gitlab-ci.yml new file mode 100644 index 000000000..8bd08c4a4 --- /dev/null +++ b/old.gitlab-ci.yml @@ -0,0 +1,1063 @@ +stages: + - level1 + - level2 + - level3 + - level4 + - level5 +'webdevops/toolbox:latest': + stage: level1 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/toolbox/latest' + - 'docker build --no-cache -t webdevops/toolbox:latest .' + - 'docker push webdevops/toolbox:latest' + - 'docker tag webdevops/toolbox:latest $CI_REGISTRY_IMAGE/toolbox:latest' + - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' + tags: + - aws +'webdevops/bootstrap:alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/bootstrap/alpine' + - 'docker build --no-cache -t webdevops/bootstrap:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_667f1a78e986a1.43610572' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e986a1.43610572' + - 'bundle install' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk4NmExLjQzNjEwNTcyIn0= Dockerfile_667f1a78e986a1.43610572' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' + - 'docker push webdevops/bootstrap:alpine' + - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/base:alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base/alpine' + - 'docker build --no-cache -t webdevops/base:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_667f1a78e98b03.36105140' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98b03.36105140' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OGIwMy4zNjEwNTE0MCJ9 Dockerfile_667f1a78e98b03.36105140' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' + - 'docker push webdevops/base:alpine' + - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base:alpine' + tags: + - aws + needs: + - 'webdevops/bootstrap:alpine' +'webdevops/nginx:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/nginx/alpine' + - 'docker build --no-cache -t webdevops/nginx:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_667f1a78e98e48.66717548' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98e48.66717548' + - 'bundle install' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOThlNDguNjY3MTc1NDgifQ== Dockerfile_667f1a78e98e48.66717548' + - 'docker push webdevops/nginx:alpine' + - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' + - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' +'webdevops/apache:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/apache/alpine' + - 'docker build --no-cache -t webdevops/apache:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_667f1a78e99111.96614651' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99111.96614651' + - 'bundle install' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5MTExLjk2NjE0NjUxIn0= Dockerfile_667f1a78e99111.96614651' + - 'docker push webdevops/apache:alpine' + - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' + - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' +'webdevops/base-app:alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base-app/alpine' + - 'docker build --no-cache -t webdevops/base-app:alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_667f1a78e993c5.66917319' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e993c5.66917319' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTkzYzUuNjY5MTczMTkifQ== Dockerfile_667f1a78e993c5.66917319' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' + - 'docker push webdevops/base-app:alpine' + - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' + - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' + tags: + - aws + needs: + - 'webdevops/base:alpine' +'webdevops/bootstrap:ubuntu-22.04': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/bootstrap/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_667f1a78e996a9.79805936' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e996a9.79805936' + - 'bundle install' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTk2YTkuNzk4MDU5MzYifQ== Dockerfile_667f1a78e996a9.79805936' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' + - 'docker push webdevops/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' + - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' + - 'docker push webdevops/bootstrap:latest' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/base:ubuntu-22.04': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_667f1a78e99961.24720922' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99961.24720922' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5OTYxLjI0NzIwOTIyIn0= Dockerfile_667f1a78e99961.24720922' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' + - 'docker push webdevops/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' + - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' + - 'docker push webdevops/base:latest' + tags: + - aws + needs: + - 'webdevops/bootstrap:ubuntu-22.04' +'webdevops/base-app:ubuntu-22.04': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/base-app/ubuntu-22.04' + - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_667f1a78e99c11.48948582' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99c11.48948582' + - 'bundle install' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OWMxMS40ODk0ODU4MiJ9 Dockerfile_667f1a78e99c11.48948582' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' + - 'docker push webdevops/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' + - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' + - 'docker push webdevops/base-app:latest' + tags: + - aws + needs: + - 'webdevops/base:ubuntu-22.04' +'webdevops/dockerfile-build-env:latest': + stage: level5 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/dockerfile-build-env/latest' + - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' + - 'docker push webdevops/dockerfile-build-env:latest' + - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' + tags: + - aws + needs: + - 'webdevops/base-app:ubuntu-22.04' +'webdevops/vsftp:latest': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/vsftp/latest' + - 'docker build --no-cache -t webdevops/vsftp:latest .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_667f1a78e9a425.86024047' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9a425.86024047' + - 'bundle install' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5YTQyNS44NjAyNDA0NyJ9 Dockerfile_667f1a78e9a425.86024047' + - 'docker push webdevops/vsftp:latest' + - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' + - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' + tags: + - aws + needs: + - 'webdevops/base:ubuntu-22.04' +'webdevops/storage:latest': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/storage/latest' + - 'docker build --no-cache -t webdevops/storage:latest .' + - 'docker push webdevops/storage:latest' + - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' + - 'docker push $CI_REGISTRY_IMAGE/storage:latest' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php:8.2': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.2' + - 'docker build --no-cache -t webdevops/php:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_667f1a78e9c787.18338734' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9c787.18338734' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljNzg3LjE4MzM4NzM0In0= Dockerfile_667f1a78e9c787.18338734' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' + - 'docker push webdevops/php:8.2' + - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2' + - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' + - 'docker push webdevops/php-official:8.2' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.2': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.2' + - 'docker build --no-cache -t webdevops/php-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_667f1a78e9ca18.84839188' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ca18.84839188' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2ExOC44NDgzOTE4OCJ9 Dockerfile_667f1a78e9ca18.84839188' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2' + - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php:8.2' +'webdevops/php-nginx:8.2': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.2' + - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_667f1a78e9cc28.80853000' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cc28.80853000' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljYzI4LjgwODUzMDAwIn0= Dockerfile_667f1a78e9cc28.80853000' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2' + - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' + tags: + - aws + needs: + - 'webdevops/php:8.2' +'webdevops/php-nginx-dev:8.2': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.2' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_667f1a78e9cf03.94640741' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cf03.94640741' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2YwMy45NDY0MDc0MSJ9 Dockerfile_667f1a78e9cf03.94640741' + - 'docker push webdevops/php-nginx-dev:8.2' + - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.2' +'webdevops/php-apache:8.2': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.2' + - 'docker build --no-cache -t webdevops/php-apache:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_667f1a78e9d122.49340362' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d122.49340362' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDEyMi40OTM0MDM2MiJ9 Dockerfile_667f1a78e9d122.49340362' + - 'docker push webdevops/php-apache:8.2' + - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' + tags: + - aws + needs: + - 'webdevops/php:8.2' +'webdevops/php-apache-dev:8.2': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.2' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_667f1a78e9d325.79477395' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d325.79477395' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWQzMjUuNzk0NzczOTUifQ== Dockerfile_667f1a78e9d325.79477395' + - 'docker push webdevops/php-apache-dev:8.2' + - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' + tags: + - aws + needs: + - 'webdevops/php-apache:8.2' +'webdevops/php:8.3': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.3' + - 'docker build --no-cache -t webdevops/php:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_667f1a78e9d503.69654040' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d503.69654040' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkNTAzLjY5NjU0MDQwIn0= Dockerfile_667f1a78e9d503.69654040' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' + - 'docker push webdevops/php:8.3' + - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3' + - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' + - 'docker push webdevops/php-official:8.3' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.3': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.3' + - 'docker build --no-cache -t webdevops/php-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_667f1a78e9d745.04130984' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d745.04130984' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDc0NS4wNDEzMDk4NCJ9 Dockerfile_667f1a78e9d745.04130984' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3' + - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php:8.3' +'webdevops/php-nginx:8.3': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.3' + - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_667f1a78e9d9b6.72303514' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d9b6.72303514' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkOWI2LjcyMzAzNTE0In0= Dockerfile_667f1a78e9d9b6.72303514' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3' + - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' + tags: + - aws + needs: + - 'webdevops/php:8.3' +'webdevops/php-nginx-dev:8.3': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_667f1a78e9dc76.11125850' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9dc76.11125850' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGM3Ni4xMTEyNTg1MCJ9 Dockerfile_667f1a78e9dc76.11125850' + - 'docker push webdevops/php-nginx-dev:8.3' + - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3' +'webdevops/php-apache:8.3': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.3' + - 'docker build --no-cache -t webdevops/php-apache:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_667f1a78e9de76.40274417' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9de76.40274417' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGU3Ni40MDI3NDQxNyJ9 Dockerfile_667f1a78e9de76.40274417' + - 'docker push webdevops/php-apache:8.3' + - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' + tags: + - aws + needs: + - 'webdevops/php:8.3' +'webdevops/php-apache-dev:8.3': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_667f1a78e9e033.60561999' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9e033.60561999' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWUwMzMuNjA1NjE5OTkifQ== Dockerfile_667f1a78e9e033.60561999' + - 'docker push webdevops/php-apache-dev:8.3' + - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3' +'webdevops/php:8.2-alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.2-alpine' + - 'docker build --no-cache -t webdevops/php:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_667f1a78e9fd69.08017350' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9fd69.08017350' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZmQ2OS4wODAxNzM1MCJ9 Dockerfile_667f1a78e9fd69.08017350' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' + - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' + - 'docker push webdevops/php-official:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.2-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_667f1a78e9ff80.10051609' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ff80.10051609' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWZmODAuMTAwNTE2MDkifQ== Dockerfile_667f1a78e9ff80.10051609' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.2-alpine' + - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.2-alpine' +'webdevops/php-nginx:8.2-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_667f1a78ea0223.80714897' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0223.80714897' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhMDIyMy44MDcxNDg5NyJ9 Dockerfile_667f1a78ea0223.80714897' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.2-alpine' + - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.2-alpine' +'webdevops/php-nginx-dev:8.2-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_667f1a78ea0482.28125239' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0482.28125239' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA0ODIuMjgxMjUyMzkifQ== Dockerfile_667f1a78ea0482.28125239' + - 'docker push webdevops/php-nginx-dev:8.2-alpine' + - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.2-alpine' +'webdevops/php-apache:8.2-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_667f1a78ea06f5.64008708' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea06f5.64008708' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA2ZjUuNjQwMDg3MDgifQ== Dockerfile_667f1a78ea06f5.64008708' + - 'docker push webdevops/php-apache:8.2-alpine' + - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.2-alpine' +'webdevops/php-apache-dev:8.2-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.2-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_667f1a78ea0940.45216278' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0940.45216278' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWEwOTQwLjQ1MjE2Mjc4In0= Dockerfile_667f1a78ea0940.45216278' + - 'docker push webdevops/php-apache-dev:8.2-alpine' + - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.2-alpine' +'webdevops/php:8.1-alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.1-alpine' + - 'docker build --no-cache -t webdevops/php:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_667f1a78ea5481.67757977' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5481.67757977' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNTQ4MS42Nzc1Nzk3NyJ9 Dockerfile_667f1a78ea5481.67757977' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' + - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' + - 'docker push webdevops/php-official:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_667f1a78ea57d7.69758972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea57d7.69758972' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTU3ZDcuNjk3NTg5NzIifQ== Dockerfile_667f1a78ea57d7.69758972' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1-alpine' + - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-nginx:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_667f1a78ea5ad9.12373386' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5ad9.12373386' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNWFkOS4xMjM3MzM4NiJ9 Dockerfile_667f1a78ea5ad9.12373386' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1-alpine' + - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-nginx-dev:8.1-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_667f1a78ea5df7.88542972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5df7.88542972' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTVkZjcuODg1NDI5NzIifQ== Dockerfile_667f1a78ea5df7.88542972' + - 'docker push webdevops/php-nginx-dev:8.1-alpine' + - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.1-alpine' +'webdevops/php-apache:8.1-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_667f1a78ea60d4.57421920' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea60d4.57421920' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTYwZDQuNTc0MjE5MjAifQ== Dockerfile_667f1a78ea60d4.57421920' + - 'docker push webdevops/php-apache:8.1-alpine' + - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.1-alpine' +'webdevops/php-apache-dev:8.1-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.1-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_667f1a78ea6379.68528757' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea6379.68528757' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE2Mzc5LjY4NTI4NzU3In0= Dockerfile_667f1a78ea6379.68528757' + - 'docker push webdevops/php-apache-dev:8.1-alpine' + - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.1-alpine' +'webdevops/php:8.3-alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.3-alpine' + - 'docker build --no-cache -t webdevops/php:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_667f1a78ea8b41.81742789' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8b41.81742789' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOGI0MS44MTc0Mjc4OSJ9 Dockerfile_667f1a78ea8b41.81742789' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' + - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' + - 'docker push webdevops/php-official:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.3-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_667f1a78ea8e30.16387680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8e30.16387680' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYThlMzAuMTYzODc2ODAifQ== Dockerfile_667f1a78ea8e30.16387680' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.3-alpine' + - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx:8.3-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_667f1a78ea90c7.39536377' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea90c7.39536377' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOTBjNy4zOTUzNjM3NyJ9 Dockerfile_667f1a78ea90c7.39536377' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.3-alpine' + - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_667f1a78ea9382.50928096' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9382.50928096' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTkzODIuNTA5MjgwOTYifQ== Dockerfile_667f1a78ea9382.50928096' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3-alpine' +'webdevops/php-apache:8.3-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_667f1a78ea9618.83273110' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9618.83273110' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTk2MTguODMyNzMxMTAifQ== Dockerfile_667f1a78ea9618.83273110' + - 'docker push webdevops/php-apache:8.3-alpine' + - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.3-alpine' +'webdevops/php-apache-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_667f1a78ea98a5.83179491' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea98a5.83179491' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5OGE1LjgzMTc5NDkxIn0= Dockerfile_667f1a78ea98a5.83179491' + - 'docker push webdevops/php-apache-dev:8.3-alpine' + - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.3-alpine' +'webdevops/php:8.1': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.1' + - 'docker build --no-cache -t webdevops/php:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_667f1a78ea9b24.63300881' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9b24.63300881' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5YjI0LjYzMzAwODgxIn0= Dockerfile_667f1a78ea9b24.63300881' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' + - 'docker push webdevops/php:8.1' + - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php:8.1' + - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' + - 'docker push webdevops/php-official:8.1' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php-dev:8.1': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.1' + - 'docker build --no-cache -t webdevops/php-dev:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_667f1a78ea9e21.36207680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9e21.36207680' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOWUyMS4zNjIwNzY4MCJ9 Dockerfile_667f1a78ea9e21.36207680' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.1' + - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' + tags: + - aws + needs: + - 'webdevops/php:8.1' +'webdevops/php-nginx:8.1': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.1' + - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_667f1a78eaa153.04305152' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa153.04305152' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWFhMTUzLjA0MzA1MTUyIn0= Dockerfile_667f1a78eaa153.04305152' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.1' + - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' + tags: + - aws + needs: + - 'webdevops/php:8.1' +'webdevops/php-nginx-dev:8.1': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.1' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_667f1a78eaa4e0.42729575' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa4e0.42729575' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTRlMC40MjcyOTU3NSJ9 Dockerfile_667f1a78eaa4e0.42729575' + - 'docker push webdevops/php-nginx-dev:8.1' + - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.1' +'webdevops/php-apache:8.1': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.1' + - 'docker build --no-cache -t webdevops/php-apache:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_667f1a78eaa807.54530156' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa807.54530156' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTgwNy41NDUzMDE1NiJ9 Dockerfile_667f1a78eaa807.54530156' + - 'docker push webdevops/php-apache:8.1' + - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' + tags: + - aws + needs: + - 'webdevops/php:8.1' +'webdevops/php-apache-dev:8.1': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.1' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_667f1a78eaac02.87762131' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaac02.87762131' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYWFjMDIuODc3NjIxMzEifQ== Dockerfile_667f1a78eaac02.87762131' + - 'docker push webdevops/php-apache-dev:8.1' + - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' + tags: + - aws + needs: + - 'webdevops/php-apache:8.1' diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 3f6791842..c0fdf3a38 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -21,7 +21,7 @@ librabbitmq4 \ {%- if distribution == 'bookworm' %} libldap-2.5-0 \ -{%- else %} +{%- else %} libldap-2.4-2 \ zlibc \ {%- endif %} @@ -65,14 +65,14 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- else %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ @@ -81,7 +81,7 @@ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} amqp \ imagick \ ffi \ @@ -99,7 +99,7 @@ mcrypt \ {%- endif %} imap \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} hash \ {%- endif %} pcntl \ @@ -108,14 +108,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} xmlrpc \ {%- endif %} xsl \ @@ -135,7 +135,7 @@ && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ -{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && pecl install memcached \ && pecl install apcu \ && pecl install excimer \ @@ -262,7 +262,7 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ @@ -281,7 +281,7 @@ exif \ ftp \ gmp \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} ffi \ imagick \ amqp \ @@ -291,7 +291,7 @@ ldap \ mysqli \ imap \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} hash \ {%- endif %} pcntl \ @@ -300,14 +300,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} xmlrpc \ {%- endif %} xsl \ @@ -316,7 +316,7 @@ gettext \ opcache \ # Install extensions for PHP 7.x - {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} + {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ @@ -327,7 +327,7 @@ && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ && docker-php-ext-enable memcached \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ @@ -412,7 +412,7 @@ && apt-install tideways-php tideways-daemon \ {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %} + {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ From 4997725ff832b3bdcec79bc21c8ba0b9807ff5a0 Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sat, 22 Feb 2025 16:26:46 +0700 Subject: [PATCH 47/63] imap has been removed from core in 8.4 --- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 4 ++-- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2-alpine/Dockerfile | 4 ++-- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3-alpine/Dockerfile | 4 ++-- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4-alpine/Dockerfile | 4 ++-- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 4 ++-- docker/php-official/8.0/Dockerfile | 2 +- docker/php-official/8.1-alpine/Dockerfile | 4 ++-- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 4 ++-- docker/php-official/8.2/Dockerfile | 2 +- docker/php-official/8.3-alpine/Dockerfile | 4 ++-- docker/php-official/8.3/Dockerfile | 2 +- docker/php-official/8.4-alpine/Dockerfile | 4 +--- docker/php-official/8.4/Dockerfile | 4 +--- template/Dockerfile/images/php.jinja2 | 8 ++++++++ 21 files changed, 36 insertions(+), 32 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 99db5a589..df945418c 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index d606d24f4..ee67b29db 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 92d1e74ad..2b555bf4c 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 6a071c5f1..0670dda63 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 6c0a8891e..19d9e9799 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 1571618ad..065378b3b 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 0db11ca34..a8785a913 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index c3d168612..dfb574912 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 0c3537634..aa250416b 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -151,7 +151,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -165,7 +165,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 032d57bc7..7df60f658 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 32eaf9688..452f79a7d 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -151,7 +151,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -165,7 +165,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 57ac73ccf..b22800529 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 0e37ad44a..942ed80a0 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 2ec1c0c33..7a2822bc7 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 9eae4960e..248c74d63 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index a27f2ac23..7442c7672 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index 2cf4b1f11..bd6d925ed 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index ee05344af..aec235cf1 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile index a61b0fa45..f79d3d0f6 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -148,8 +148,7 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -164,7 +163,6 @@ RUN set -x \ gettext \ ldap \ mysqli \ - imap \ pcntl \ pdo_mysql \ pdo_pgsql \ diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index c66e6d2b6..f79839c03 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -143,8 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install \ bcmath \ amqp \ @@ -159,7 +158,6 @@ RUN set -x \ gettext \ ldap \ mysqli \ - imap \ pcntl \ pdo_mysql \ pdo_pgsql \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index c0fdf3a38..87f6501ae 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -78,7 +78,9 @@ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ +{%- if version != '8.4' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ +{%- endif %} && docker-php-ext-install \ bcmath \ {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} @@ -98,7 +100,9 @@ {%- if version|int == 5 or version == '7.0' or version == '7.1' %} mcrypt \ {%- endif %} +{%- if version != '8.4' %} imap \ +{%- endif %} {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} hash \ {%- endif %} @@ -273,7 +277,9 @@ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- endif %} && docker-php-ext-configure ldap \ +{%- if version != '8.4' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ +{%- endif %} && docker-php-ext-install \ bcmath \ bz2 \ @@ -290,7 +296,9 @@ gettext \ ldap \ mysqli \ +{%- if version != '8.4' %} imap \ +{%- endif %} {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} hash \ {%- endif %} From a69bc8d90656f7ffe6e47a01dbfa59926f0f0af9 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 12 May 2025 16:13:43 +0200 Subject: [PATCH 48/63] =?UTF-8?q?=F0=9F=90=9B=20fix=20alpine=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ .../php/general/provision/bootstrap.d/30-setup-ioncube.sh | 5 +++++ 21 files changed, 105 insertions(+) diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.2/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.3/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ b/docker/php-official/8.4/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" diff --git a/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh b/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh index df40ec25e..4a348a38a 100644 --- a/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh +++ b/provisioning/php/general/provision/bootstrap.d/30-setup-ioncube.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + echo "Installing ionCube loader" DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" From 05babc0091b9605577e876f21fdbd0b5bcbfb227 Mon Sep 17 00:00:00 2001 From: Wesley Bos Date: Mon, 29 Sep 2025 17:43:48 +0200 Subject: [PATCH 49/63] fix: required changes for ARM to build --- docker/toolbox/latest/Dockerfile.jinja2 | 1 + template/Dockerfile/images/php.jinja2 | 14 +++++++------- template/Dockerfile/tools.jinja2 | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docker/toolbox/latest/Dockerfile.jinja2 b/docker/toolbox/latest/Dockerfile.jinja2 index 3b185c2cb..cd1b0c49f 100644 --- a/docker/toolbox/latest/Dockerfile.jinja2 +++ b/docker/toolbox/latest/Dockerfile.jinja2 @@ -1,4 +1,5 @@ {{ docker.fromOfficial("alpine") }} +ARG TARGETARCH RUN apk add --no-cache \ ca-certificates \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 87f6501ae..32e5462a4 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -77,10 +77,10 @@ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ {%- if version != '8.4' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ -{%- endif %} +{%- endif %} && docker-php-ext-install \ bcmath \ {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} @@ -248,7 +248,7 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -279,7 +279,7 @@ && docker-php-ext-configure ldap \ {%- if version != '8.4' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ -{%- endif %} +{%- endif %} && docker-php-ext-install \ bcmath \ bz2 \ @@ -296,9 +296,9 @@ gettext \ ldap \ mysqli \ -{%- if version != '8.4' %} +{%- if version != '8.4' %} imap \ -{%- endif %} +{%- endif %} {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} hash \ {%- endif %} @@ -398,7 +398,7 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 458837ce9..b15ac5b8b 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,14 +1,14 @@ {% macro goreplace(path="/usr/local/bin", version="22.10.0") -%} ## Install go-replace - && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.amd64" \ + && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.$TARGETARCH" \ && chmod +x "{{ path }}/go-replace" \ && "{{ path }}/go-replace" --version {%- endmacro %} -{% macro gosu(path="/sbin", arch="amd64", version="1.10") -%} +{% macro gosu(path="/sbin", version="1.10") -%} # Install gosu - && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}.asc" \ + && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH" \ + && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /tmp/gosu.asc "{{ path }}/gosu" \ From 1e5f5a1c948ef9c2bad0f698b432ec6a1f737abd Mon Sep 17 00:00:00 2001 From: Wesley Bos Date: Mon, 29 Sep 2025 17:44:24 +0200 Subject: [PATCH 50/63] chore: resuling changes in Dockerfiles Can revert this commit as they should be auto-generated --- docker/php-official/8.4-alpine/Dockerfile | 8 ++++---- docker/php-official/8.4/Dockerfile | 2 +- docker/toolbox/latest/Dockerfile | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile index f79d3d0f6..409e2c4c5 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -125,7 +125,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -148,7 +148,7 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -228,7 +228,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index f79839c03..5700d6700 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index 780356b8d..530b6bf56 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -4,6 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ FROM alpine:latest +ARG TARGETARCH RUN apk add --no-cache \ ca-certificates \ @@ -29,13 +30,13 @@ RUN apk add --no-cache \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.amd64" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.$TARGETARCH" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ && ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ From e2490c54ad310bd3580e201d572ce497297b0117 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Thu, 27 Nov 2025 17:31:59 +0100 Subject: [PATCH 51/63] =?UTF-8?q?=E2=9E=95=20add=20php=208.5=20+=20?= =?UTF-8?q?=F0=9F=90=9B=20fix=20alpine=20images=20with=20version=203.22=20?= =?UTF-8?q?(php=208.1-8.5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 610 +++++++++++++----- README.md | 16 +- build-local.sh | 2 +- conf/console.yml | 2 +- docker/php-apache-dev/8.5-alpine/Dockerfile | 38 ++ .../8.5-alpine/Dockerfile.jinja2 | 11 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache-dev/8.5/Dockerfile | 32 + docker/php-apache-dev/8.5/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.5/conf/bin/service.d/blackfire-agent.sh | 25 + .../8.5/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.5/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache/8.5-alpine/Dockerfile | 33 + .../php-apache/8.5-alpine/Dockerfile.jinja2 | 12 + .../conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.5-alpine/conf/bin/service.d/httpd.sh | 13 + .../8.5-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../conf/etc/httpd/conf.d/10-log.conf | 4 + .../conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../conf/etc/httpd/conf.d/10-server.conf | 18 + .../8.5-alpine/conf/etc/httpd/global.conf | 1 + .../8.5-alpine/conf/etc/httpd/main.conf | 10 + .../8.5-alpine/conf/etc/httpd/php.conf | 1 + .../8.5-alpine/conf/etc/httpd/ssl/server.crt | 28 + .../8.5-alpine/conf/etc/httpd/ssl/server.csr | 26 + .../8.5-alpine/conf/etc/httpd/ssl/server.key | 51 ++ .../conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../8.5-alpine/conf/etc/httpd/vhost.conf | 36 ++ .../8.5-alpine/conf/etc/httpd/vhost.ssl.conf | 26 + .../conf/etc/supervisor.d/apache.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 +++ .../conf/provision/bootstrap.d/10-php.sh | 8 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-apache/8.5/Dockerfile | 30 + docker/php-apache/8.5/Dockerfile.jinja2 | 13 + .../8.5/conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.5/conf/bin/service.d/httpd.sh | 14 + .../8.5/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../8.5/conf/etc/httpd/conf.d/10-log.conf | 4 + .../8.5/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../8.5/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/8.5/conf/etc/httpd/global.conf | 1 + .../php-apache/8.5/conf/etc/httpd/main.conf | 10 + docker/php-apache/8.5/conf/etc/httpd/php.conf | 1 + .../8.5/conf/etc/httpd/ssl/server.crt | 28 + .../8.5/conf/etc/httpd/ssl/server.csr | 26 + .../8.5/conf/etc/httpd/ssl/server.key | 51 ++ .../8.5/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/8.5/conf/etc/httpd/vhost.conf | 36 ++ .../8.5/conf/etc/httpd/vhost.ssl.conf | 26 + .../8.5/conf/etc/supervisor.d/apache.conf | 14 + .../8.5/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 +++ .../8.5/conf/provision/bootstrap.d/10-php.sh | 8 + .../8.5/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-dev/8.5-alpine/Dockerfile | 30 + docker/php-dev/8.5-alpine/Dockerfile.jinja2 | 7 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ docker/php-dev/8.5/Dockerfile | 24 + docker/php-dev/8.5/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.5/conf/bin/service.d/blackfire-agent.sh | 25 + .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.5/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ docker/php-nginx-dev/8.5-alpine/Dockerfile | 38 ++ .../8.5-alpine/Dockerfile.jinja2 | 11 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 + .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx-dev/8.5/Dockerfile | 32 + docker/php-nginx-dev/8.5/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.5/conf/bin/service.d/blackfire-agent.sh | 25 + .../8.5/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.5/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../8.5/conf/provision/bootstrap.d/10-php.sh | 24 + .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 + .../provision/entrypoint.d/10-php-debugger.sh | 106 +++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx/8.5-alpine/Dockerfile | 24 + docker/php-nginx/8.5-alpine/Dockerfile.jinja2 | 13 + .../conf/bin/service.d/nginx.d/10-init.sh | 5 + .../8.5-alpine/conf/bin/service.d/nginx.sh | 10 + .../8.5-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../8.5-alpine/conf/etc/nginx/global.conf | 1 + .../8.5-alpine/conf/etc/nginx/main.conf | 4 + .../8.5-alpine/conf/etc/nginx/nginx.conf | 34 + .../8.5-alpine/conf/etc/nginx/php.conf | 1 + .../8.5-alpine/conf/etc/nginx/ssl/server.crt | 28 + .../8.5-alpine/conf/etc/nginx/ssl/server.csr | 26 + .../8.5-alpine/conf/etc/nginx/ssl/server.key | 51 ++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../8.5-alpine/conf/etc/nginx/vhost.conf | 28 + .../8.5-alpine/conf/etc/nginx/vhost.ssl.conf | 6 + .../conf/etc/supervisor.d/nginx.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../conf/provision/bootstrap.d/10-php.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 + docker/php-nginx/8.5/Dockerfile | 28 + docker/php-nginx/8.5/Dockerfile.jinja2 | 14 + .../8.5/conf/bin/service.d/nginx.d/10-init.sh | 5 + .../php-nginx/8.5/conf/bin/service.d/nginx.sh | 10 + .../8.5/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.5/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/8.5/conf/etc/nginx/global.conf | 1 + docker/php-nginx/8.5/conf/etc/nginx/main.conf | 4 + docker/php-nginx/8.5/conf/etc/nginx/php.conf | 1 + .../8.5/conf/etc/nginx/ssl/server.crt | 28 + .../8.5/conf/etc/nginx/ssl/server.csr | 26 + .../8.5/conf/etc/nginx/ssl/server.key | 51 ++ .../8.5/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/8.5/conf/etc/nginx/vhost.conf | 28 + .../8.5/conf/etc/nginx/vhost.ssl.conf | 6 + .../8.5/conf/etc/supervisor.d/nginx.conf | 14 + .../8.5/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../8.5/conf/provision/bootstrap.d/10-php.sh | 7 + .../8.5/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 + docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 4 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2-alpine/Dockerfile | 4 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3-alpine/Dockerfile | 4 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4-alpine/Dockerfile | 4 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 4 +- docker/php-official/8.0/Dockerfile | 2 +- docker/php-official/8.1-alpine/Dockerfile | 4 +- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 8 +- docker/php-official/8.2/Dockerfile | 2 +- docker/php-official/8.3-alpine/Dockerfile | 8 +- docker/php-official/8.3/Dockerfile | 2 +- docker/php-official/8.4-alpine/Dockerfile | 6 +- docker/php-official/8.4/Dockerfile | 2 +- docker/php-official/8.5-alpine/Dockerfile | 249 +++++++ .../php-official/8.5-alpine/Dockerfile.jinja2 | 35 + docker/php-official/8.5-alpine/conf/VERSION | 1 + .../8.5-alpine/conf/bin/bootstrap.sh | 3 + .../8.5-alpine/conf/bin/config.sh | 117 ++++ .../8.5-alpine/conf/bin/control.sh | 160 +++++ .../8.5-alpine/conf/bin/entrypoint.d/cli.sh | 19 + .../conf/bin/entrypoint.d/default.sh | 3 + .../8.5-alpine/conf/bin/entrypoint.d/noop.sh | 7 + .../8.5-alpine/conf/bin/entrypoint.d/root.sh | 14 + .../conf/bin/entrypoint.d/supervisord.sh | 9 + .../8.5-alpine/conf/bin/entrypoint.sh | 46 ++ .../8.5-alpine/conf/bin/provision | 8 + .../8.5-alpine/conf/bin/provision.py | 328 ++++++++++ .../conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.5-alpine/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.5-alpine/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.5-alpine/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 + .../8.5-alpine/conf/bin/service.d/postfix.sh | 42 ++ .../conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.5-alpine/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 + .../conf/bin/usr-bin/docker-ansible-install | 77 +++ .../conf/bin/usr-bin/docker-cronjob | 26 + .../conf/bin/usr-bin/docker-php-setting | 44 ++ .../conf/bin/usr-bin/docker-provision | 9 + .../conf/bin/usr-bin/docker-service | 89 +++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../8.5-alpine/conf/bin/usr-bin/service | 86 +++ .../conf/bin/usr-bin/version-compare | 43 ++ .../8.5-alpine/conf/etc/cron/.gitkeep | 0 .../8.5-alpine/conf/etc/logrotate.d/php5-fpm | 12 + .../8.5-alpine/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.5-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.5-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.5-alpine/conf/etc/php/php.ini | 1 + .../8.5-alpine/conf/etc/php/php.webdevops.ini | 34 + .../8.5-alpine/conf/etc/supervisor.conf | 20 + .../8.5-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 + .../conf/etc/supervisor.d/dnsmasq.conf | 14 + .../conf/etc/supervisor.d/php-fpm.conf | 15 + .../conf/etc/supervisor.d/postfix.conf | 15 + .../8.5-alpine/conf/etc/supervisor.d/ssh.conf | 14 + .../conf/etc/supervisor.d/syslog.conf | 13 + .../conf/etc/syslog-ng/syslog-ng.conf | 48 ++ .../8.5-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 8 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 ++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 ++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 50 ++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++ .../conf/provision/entrypoint.d/20-php.sh | 75 +++ .../conf/provision/onbuild.d/.gitkeep | 0 .../8.5-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 + .../conf/provision/service.d/dnsmasq.sh | 24 + .../conf/provision/service.d/postfix.sh | 32 + .../conf/provision/service.d/ssh.sh | 17 + .../conf/provision/service.d/syslog.sh | 41 ++ .../conf/provision/variables-webdevops.yml | 7 + .../8.5-alpine/conf/provision/variables.yml | 7 + docker/php-official/8.5/Dockerfile | 227 +++++++ docker/php-official/8.5/Dockerfile.jinja2 | 37 ++ docker/php-official/8.5/conf/VERSION | 1 + docker/php-official/8.5/conf/bin/bootstrap.sh | 3 + docker/php-official/8.5/conf/bin/config.sh | 117 ++++ docker/php-official/8.5/conf/bin/control.sh | 160 +++++ .../8.5/conf/bin/entrypoint.d/cli.sh | 19 + .../8.5/conf/bin/entrypoint.d/default.sh | 3 + .../8.5/conf/bin/entrypoint.d/noop.sh | 7 + .../8.5/conf/bin/entrypoint.d/root.sh | 14 + .../8.5/conf/bin/entrypoint.d/supervisord.sh | 9 + .../php-official/8.5/conf/bin/entrypoint.sh | 46 ++ docker/php-official/8.5/conf/bin/provision | 8 + docker/php-official/8.5/conf/bin/provision.py | 328 ++++++++++ .../8.5/conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.5/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.5/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.5/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 + .../8.5/conf/bin/service.d/postfix.sh | 42 ++ .../8.5/conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.5/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../8.5/conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../8.5/conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 + .../conf/bin/usr-bin/docker-ansible-install | 77 +++ .../8.5/conf/bin/usr-bin/docker-cronjob | 26 + .../8.5/conf/bin/usr-bin/docker-php-setting | 44 ++ .../8.5/conf/bin/usr-bin/docker-provision | 9 + .../8.5/conf/bin/usr-bin/docker-service | 89 +++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../php-official/8.5/conf/bin/usr-bin/service | 86 +++ .../8.5/conf/bin/usr-bin/version-compare | 43 ++ .../php-official/8.5/conf/etc/cron/.gitkeep | 0 .../8.5/conf/etc/logrotate.d/php5-fpm | 12 + .../8.5/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.5/conf/etc/php/conf.d/.gitkeep | 0 .../8.5/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.5/conf/etc/php/php.ini | 1 + .../8.5/conf/etc/php/php.webdevops.ini | 34 + .../php-official/8.5/conf/etc/supervisor.conf | 20 + .../8.5/conf/etc/supervisor.d/.gitkeep | 0 .../8.5/conf/etc/supervisor.d/cron.conf | 14 + .../8.5/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../8.5/conf/etc/supervisor.d/php-fpm.conf | 15 + .../8.5/conf/etc/supervisor.d/postfix.conf | 15 + .../8.5/conf/etc/supervisor.d/ssh.conf | 14 + .../8.5/conf/etc/supervisor.d/syslog.conf | 13 + .../8.5/conf/etc/syslog-ng/syslog-ng.conf | 48 ++ .../8.5/conf/provision/ansible.cfg | 0 .../8.5/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 10 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../8.5/conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 ++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 ++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 50 ++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../8.5/conf/provision/build.d/.gitkeep | 0 .../8.5/conf/provision/build.d/10-cleanup.sh | 7 + .../8.5/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++ .../8.5/conf/provision/entrypoint.d/20-php.sh | 75 +++ .../8.5/conf/provision/onbuild.d/.gitkeep | 0 .../8.5/conf/provision/roles/.gitkeep | 0 .../8.5/conf/provision/service.d/.gitkeep | 0 .../8.5/conf/provision/service.d/cron.sh | 13 + .../8.5/conf/provision/service.d/dnsmasq.sh | 24 + .../8.5/conf/provision/service.d/postfix.sh | 32 + .../8.5/conf/provision/service.d/ssh.sh | 17 + .../8.5/conf/provision/service.d/syslog.sh | 41 ++ .../conf/provision/variables-webdevops.yml | 7 + .../8.5/conf/provision/variables.yml | 7 + docker/php/8.5 | 1 + docker/php/8.5-alpine | 1 + .../dockerfiles/include/image-tag-php.rst | 2 + template/Dockerfile/images/php.jinja2 | 52 +- 389 files changed, 8582 insertions(+), 231 deletions(-) create mode 100644 docker/php-apache-dev/8.5-alpine/Dockerfile create mode 100644 docker/php-apache-dev/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache-dev/8.5/Dockerfile create mode 100644 docker/php-apache-dev/8.5/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache/8.5-alpine/Dockerfile create mode 100644 docker/php-apache/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-apache/8.5/Dockerfile create mode 100644 docker/php-apache/8.5/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.5/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.5/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.5/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.5/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.5/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-dev/8.5-alpine/Dockerfile create mode 100644 docker/php-dev/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.5-alpine/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/8.5/Dockerfile create mode 100644 docker/php-dev/8.5/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/Dockerfile create mode 100644 docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx-dev/8.5/Dockerfile create mode 100644 docker/php-nginx-dev/8.5/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx/8.5-alpine/Dockerfile create mode 100644 docker/php-nginx/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-nginx/8.5/Dockerfile create mode 100644 docker/php-nginx/8.5/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.5/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.5/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.5/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.5/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-official/8.5-alpine/Dockerfile create mode 100644 docker/php-official/8.5-alpine/Dockerfile.jinja2 create mode 100644 docker/php-official/8.5-alpine/conf/VERSION create mode 100644 docker/php-official/8.5-alpine/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/config.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/control.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.5-alpine/conf/bin/provision create mode 100755 docker/php-official/8.5-alpine/conf/bin/provision.py create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.5-alpine/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/etc/php/php.ini create mode 100644 docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.5-alpine/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.5-alpine/conf/provision/variables.yml create mode 100644 docker/php-official/8.5/Dockerfile create mode 100644 docker/php-official/8.5/Dockerfile.jinja2 create mode 100644 docker/php-official/8.5/conf/VERSION create mode 100644 docker/php-official/8.5/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.5/conf/bin/config.sh create mode 100644 docker/php-official/8.5/conf/bin/control.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.5/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.5/conf/bin/provision create mode 100755 docker/php-official/8.5/conf/bin/provision.py create mode 100644 docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.5/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.5/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.5/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.5/conf/etc/php/php.ini create mode 100644 docker/php-official/8.5/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.5/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.5/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.5/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.5/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.5/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.5/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.5/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.5/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.5/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.5/conf/provision/variables.yml create mode 120000 docker/php/8.5 create mode 120000 docker/php/8.5-alpine diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c988057a7..9bf93863e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_67b33780216a78.44838910' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780216a78.44838910' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_69287be80a1128.04599452' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1128.04599452' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE2YTc4LjQ0ODM4OTEwIn0= Dockerfile_67b33780216a78.44838910' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGExMTI4LjA0NTk5NDUyIn0= Dockerfile_69287be80a1128.04599452' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -51,10 +51,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_67b33780214e35.25363639' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780214e35.25363639' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_69287be80a1fd9.42714191' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1fd9.42714191' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTRlMzUuMjUzNjM2MzkifQ== Dockerfile_67b33780214e35.25363639' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTFmZDkuNDI3MTQxOTEifQ== Dockerfile_69287be80a1fd9.42714191' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -76,10 +76,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_67b3378024f8d2.27347713' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378024f8d2.27347713' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_69287be80857d1.86702937' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80857d1.86702937' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjRmOGQyLjI3MzQ3NzEzIn0= Dockerfile_67b3378024f8d2.27347713' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg1N2QxLjg2NzAyOTM3In0= Dockerfile_69287be80857d1.86702937' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -101,10 +101,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_67b3378023dc34.89923799' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023dc34.89923799' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_69287be809c8c1.98352639' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809c8c1.98352639' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIzZGMzNC44OTkyMzc5OSJ9 Dockerfile_67b3378023dc34.89923799' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YzhjMS45ODM1MjYzOSJ9 Dockerfile_69287be809c8c1.98352639' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -126,10 +126,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_67b33780224305.94882603' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780224305.94882603' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_69287be8095ea5.80219908' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8095ea5.80219908' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI0MzA1Ljk0ODgyNjAzIn0= Dockerfile_67b33780224305.94882603' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDk1ZWE1LjgwMjE5OTA4In0= Dockerfile_69287be8095ea5.80219908' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -151,10 +151,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_67b3378022db19.74137044' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022db19.74137044' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_69287be808fcf5.62609062' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808fcf5.62609062' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyZGIxOS43NDEzNzA0NCJ9 Dockerfile_67b3378022db19.74137044' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZmNmNS42MjYwOTA2MiJ9 Dockerfile_69287be808fcf5.62609062' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -176,10 +176,10 @@ stages: - 'cd docker/php-official/8.3' - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_67b33780226889.37238216' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780226889.37238216' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_69287be809ec52.80068095' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809ec52.80068095' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI2ODg5LjM3MjM4MjE2In0= Dockerfile_67b33780226889.37238216' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDllYzUyLjgwMDY4MDk1In0= Dockerfile_69287be809ec52.80068095' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - 'docker push webdevops/php:8.3' @@ -201,10 +201,10 @@ stages: - 'cd docker/php-official/8.3-alpine' - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_67b33780222417.04342489' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780222417.04342489' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_69287be8087197.84499594' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8087197.84499594' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMjQxNy4wNDM0MjQ4OSJ9 Dockerfile_67b33780222417.04342489' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NzE5Ny44NDQ5OTU5NCJ9 Dockerfile_69287be8087197.84499594' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - 'docker push webdevops/php:8.3-alpine' @@ -226,10 +226,10 @@ stages: - 'cd docker/php-official/8.4' - 'docker build --no-cache -t webdevops/php:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4" >> Dockerfile_67b33780240537.39972307' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780240537.39972307' + - 'echo "FROM webdevops/php:8.4" >> Dockerfile_69287be809a362.88889011' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809a362.88889011' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjQwNTM3LjM5OTcyMzA3In0= Dockerfile_67b33780240537.39972307' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDlhMzYyLjg4ODg5MDExIn0= Dockerfile_69287be809a362.88889011' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml' - 'docker push webdevops/php:8.4' @@ -251,10 +251,10 @@ stages: - 'cd docker/php-official/8.4-alpine' - 'docker build --no-cache -t webdevops/php:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_67b33780220d09.67839072' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780220d09.67839072' + - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_69287be8091162.95273204' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8091162.95273204' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMGQwOS42NzgzOTA3MiJ9 Dockerfile_67b33780220d09.67839072' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MTE2Mi45NTI3MzIwNCJ9 Dockerfile_69287be8091162.95273204' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml' - 'docker push webdevops/php:8.4-alpine' @@ -266,6 +266,56 @@ stages: - aws needs: - 'webdevops/toolbox:latest' +'webdevops/php:8.5': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.5' + - 'docker build --no-cache -t webdevops/php:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.5" >> Dockerfile_69287be808d961.29259230' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808d961.29259230' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDhkOTYxLjI5MjU5MjMwIn0= Dockerfile_69287be808d961.29259230' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml' + - 'docker push webdevops/php:8.5' + - 'docker tag webdevops/php:8.5 $CI_REGISTRY_IMAGE/php:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php:8.5' + - 'docker tag webdevops/php:8.5 webdevops/php-official:8.5' + - 'docker push webdevops/php-official:8.5' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' +'webdevops/php:8.5-alpine': + stage: level2 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-official/8.5-alpine' + - 'docker build --no-cache -t webdevops/php:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_69287be809da51.55661187' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809da51.55661187' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZGE1MS41NTY2MTE4NyJ9 Dockerfile_69287be809da51.55661187' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml' + - 'docker push webdevops/php:8.5-alpine' + - 'docker tag webdevops/php:8.5-alpine $CI_REGISTRY_IMAGE/php:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php:8.5-alpine' + - 'docker tag webdevops/php:8.5-alpine webdevops/php-official:8.5-alpine' + - 'docker push webdevops/php-official:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/toolbox:latest' 'webdevops/storage:latest': stage: level2 before_script: @@ -292,10 +342,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_67b33780216ee1.41883577' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780216ee1.41883577' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_69287be80a1420.37249045' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1420.37249045' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNmVlMS40MTg4MzU3NyJ9 Dockerfile_67b33780216ee1.41883577' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMTQyMC4zNzI0OTA0NSJ9 Dockerfile_69287be80a1420.37249045' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -315,10 +365,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_67b33780215452.09106799' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780215452.09106799' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_69287be80a2271.41603408' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a2271.41603408' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE1NDUyLjA5MTA2Nzk5In0= Dockerfile_67b33780215452.09106799' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGEyMjcxLjQxNjAzNDA4In0= Dockerfile_69287be80a2271.41603408' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -340,10 +390,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_67b33780250782.57437894' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780250782.57437894' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_69287be8086040.55246786' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8086040.55246786' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MDc4Mi41NzQzNzg5NCJ9 Dockerfile_67b33780250782.57437894' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NjA0MC41NTI0Njc4NiJ9 Dockerfile_69287be8086040.55246786' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -361,10 +411,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_67b3378023efa2.31447016' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023efa2.31447016' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_69287be809cc84.38539116' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809cc84.38539116' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2VmYTIuMzE0NDcwMTYifQ== Dockerfile_67b3378023efa2.31447016' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWNjODQuMzg1MzkxMTYifQ== Dockerfile_69287be809cc84.38539116' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -382,10 +432,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_67b33780224f36.01642941' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780224f36.01642941' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_69287be8096356.83522689' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8096356.83522689' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNGYzNi4wMTY0Mjk0MSJ9 Dockerfile_67b33780224f36.01642941' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NjM1Ni44MzUyMjY4OSJ9 Dockerfile_69287be8096356.83522689' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -403,10 +453,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_67b3378022e321.36917823' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022e321.36917823' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_69287be80902c8.44617894' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80902c8.44617894' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmUzMjEuMzY5MTc4MjMifQ== Dockerfile_67b3378022e321.36917823' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTAyYzguNDQ2MTc4OTQifQ== Dockerfile_69287be80902c8.44617894' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -424,10 +474,10 @@ stages: - 'cd docker/php-apache/8.3' - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_67b33780227951.29831764' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780227951.29831764' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_69287be809ef34.66930314' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809ef34.66930314' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNzk1MS4yOTgzMTc2NCJ9 Dockerfile_67b33780227951.29831764' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZWYzNC42NjkzMDMxNCJ9 Dockerfile_69287be809ef34.66930314' - 'docker push webdevops/php-apache:8.3' - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' @@ -445,10 +495,10 @@ stages: - 'cd docker/php-apache/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_67b33780223057.11549528' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780223057.11549528' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_69287be8087379.30688170' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8087379.30688170' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjMwNTcuMTE1NDk1MjgifQ== Dockerfile_67b33780223057.11549528' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODczNzkuMzA2ODgxNzAifQ== Dockerfile_69287be8087379.30688170' - 'docker push webdevops/php-apache:8.3-alpine' - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' @@ -466,10 +516,10 @@ stages: - 'cd docker/php-apache/8.4' - 'docker build --no-cache -t webdevops/php-apache:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_67b33780241669.66363972' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780241669.66363972' + - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_69287be809a659.15912536' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809a659.15912536' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MTY2OS42NjM2Mzk3MiJ9 Dockerfile_67b33780241669.66363972' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YTY1OS4xNTkxMjUzNiJ9 Dockerfile_69287be809a659.15912536' - 'docker push webdevops/php-apache:8.4' - 'docker tag webdevops/php-apache:8.4 $CI_REGISTRY_IMAGE/php-apache:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4' @@ -487,10 +537,10 @@ stages: - 'cd docker/php-apache/8.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_67b33780221375.80839496' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780221375.80839496' + - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_69287be8091443.98815882' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8091443.98815882' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjEzNzUuODA4Mzk0OTYifQ== Dockerfile_67b33780221375.80839496' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTE0NDMuOTg4MTU4ODIifQ== Dockerfile_69287be8091443.98815882' - 'docker push webdevops/php-apache:8.4-alpine' - 'docker tag webdevops/php-apache:8.4-alpine $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' @@ -498,6 +548,48 @@ stages: - aws needs: - 'webdevops/php:8.4-alpine' +'webdevops/php-apache:8.5': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.5' + - 'docker build --no-cache -t webdevops/php-apache:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.5" >> Dockerfile_69287be808dde1.87460582' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808dde1.87460582' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZGRlMS44NzQ2MDU4MiJ9 Dockerfile_69287be808dde1.87460582' + - 'docker push webdevops/php-apache:8.5' + - 'docker tag webdevops/php-apache:8.5 $CI_REGISTRY_IMAGE/php-apache:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5' + tags: + - aws + needs: + - 'webdevops/php:8.5' +'webdevops/php-apache:8.5-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache/8.5-alpine' + - 'docker build --no-cache -t webdevops/php-apache:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_69287be809de48.62884443' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809de48.62884443' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWRlNDguNjI4ODQ0NDMifQ== Dockerfile_69287be809de48.62884443' + - 'docker push webdevops/php-apache:8.5-alpine' + - 'docker tag webdevops/php-apache:8.5-alpine $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.5-alpine' 'webdevops/php-dev:8.1': stage: level3 before_script: @@ -508,10 +600,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_67b33780250158.76524197' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780250158.76524197' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_69287be80865b8.08882691' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80865b8.08882691' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MDE1OC43NjUyNDE5NyJ9 Dockerfile_67b33780250158.76524197' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NjViOC4wODg4MjY5MSJ9 Dockerfile_69287be80865b8.08882691' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -531,10 +623,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_67b3378023e319.33479644' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023e319.33479644' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_69287be809d249.39633466' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809d249.39633466' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2UzMTkuMzM0Nzk2NDQifQ== Dockerfile_67b3378023e319.33479644' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWQyNDkuMzk2MzM0NjYifQ== Dockerfile_69287be809d249.39633466' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -554,10 +646,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_67b33780224b49.67003782' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780224b49.67003782' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_69287be8096a14.11893350' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8096a14.11893350' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNGI0OS42NzAwMzc4MiJ9 Dockerfile_67b33780224b49.67003782' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NmExNC4xMTg5MzM1MCJ9 Dockerfile_69287be8096a14.11893350' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -577,10 +669,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_67b3378022ddd1.71440200' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022ddd1.71440200' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_69287be8090975.75273771' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8090975.75273771' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmRkZDEuNzE0NDAyMDAifQ== Dockerfile_67b3378022ddd1.71440200' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTA5NzUuNzUyNzM3NzEifQ== Dockerfile_69287be8090975.75273771' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -600,10 +692,10 @@ stages: - 'cd docker/php-dev/8.3' - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_67b337802273f4.20899500' - - 'echo "COPY conf/ /" >> Dockerfile_67b337802273f4.20899500' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_69287be809f618.46491550' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809f618.46491550' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNzNmNC4yMDg5OTUwMCJ9 Dockerfile_67b337802273f4.20899500' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZjYxOC40NjQ5MTU1MCJ9 Dockerfile_69287be809f618.46491550' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3' @@ -623,10 +715,10 @@ stages: - 'cd docker/php-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_67b33780222898.27776469' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780222898.27776469' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_69287be80879b7.76968640' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80879b7.76968640' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjI4OTguMjc3NzY0NjkifQ== Dockerfile_67b33780222898.27776469' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODc5YjcuNzY5Njg2NDAifQ== Dockerfile_69287be80879b7.76968640' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3-alpine' @@ -646,10 +738,10 @@ stages: - 'cd docker/php-dev/8.4' - 'docker build --no-cache -t webdevops/php-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_67b33780240cd3.25453164' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780240cd3.25453164' + - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_69287be809acc7.13310467' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809acc7.13310467' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MGNkMy4yNTQ1MzE2NCJ9 Dockerfile_67b33780240cd3.25453164' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YWNjNy4xMzMxMDQ2NyJ9 Dockerfile_69287be809acc7.13310467' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.4' @@ -669,10 +761,10 @@ stages: - 'cd docker/php-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_67b33780221096.32273434' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780221096.32273434' + - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_69287be8091917.39182480' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8091917.39182480' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjEwOTYuMzIyNzM0MzQifQ== Dockerfile_67b33780221096.32273434' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTE5MTcuMzkxODI0ODAifQ== Dockerfile_69287be8091917.39182480' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.4-alpine' @@ -682,6 +774,52 @@ stages: - aws needs: - 'webdevops/php:8.4-alpine' +'webdevops/php-dev:8.5': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.5' + - 'docker build --no-cache -t webdevops/php-dev:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.5" >> Dockerfile_69287be808e412.80583875' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808e412.80583875' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZTQxMi44MDU4Mzg3NSJ9 Dockerfile_69287be808e412.80583875' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.5' + - 'docker tag webdevops/php-dev:8.5 $CI_REGISTRY_IMAGE/php-dev:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5' + tags: + - aws + needs: + - 'webdevops/php:8.5' +'webdevops/php-dev:8.5-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-dev/8.5-alpine' + - 'docker build --no-cache -t webdevops/php-dev:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_69287be809e491.90391978' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809e491.90391978' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWU0OTEuOTAzOTE5NzgifQ== Dockerfile_69287be809e491.90391978' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml' + - 'docker push webdevops/php-dev:8.5-alpine' + - 'docker tag webdevops/php-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.5-alpine' 'webdevops/php-nginx:8.1': stage: level3 before_script: @@ -692,10 +830,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_67b33780251289.29081473' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780251289.29081473' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_69287be8086ae7.34611114' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8086ae7.34611114' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjUxMjg5LjI5MDgxNDczIn0= Dockerfile_67b33780251289.29081473' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg2YWU3LjM0NjExMTE0In0= Dockerfile_69287be8086ae7.34611114' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -715,10 +853,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_67b3378023f6b7.58331226' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023f6b7.58331226' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_69287be809d400.62365738' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809d400.62365738' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIzZjZiNy41ODMzMTIyNiJ9 Dockerfile_67b3378023f6b7.58331226' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZDQwMC42MjM2NTczOCJ9 Dockerfile_69287be809d400.62365738' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -738,10 +876,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_67b33780225875.98479028' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780225875.98479028' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_69287be8096be5.07623118' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8096be5.07623118' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI1ODc1Ljk4NDc5MDI4In0= Dockerfile_67b33780225875.98479028' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDk2YmU1LjA3NjIzMTE4In0= Dockerfile_69287be8096be5.07623118' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -761,10 +899,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_67b3378022eb39.08525303' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022eb39.08525303' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_69287be8090af2.51704423' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8090af2.51704423' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyZWIzOS4wODUyNTMwMyJ9 Dockerfile_67b3378022eb39.08525303' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MGFmMi41MTcwNDQyMyJ9 Dockerfile_69287be8090af2.51704423' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -784,10 +922,10 @@ stages: - 'cd docker/php-nginx/8.3' - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_67b33780228964.55110588' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780228964.55110588' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_69287be809f952.98817264' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809f952.98817264' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjI4OTY0LjU1MTEwNTg4In0= Dockerfile_67b33780228964.55110588' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDlmOTUyLjk4ODE3MjY0In0= Dockerfile_69287be809f952.98817264' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3' @@ -807,10 +945,10 @@ stages: - 'cd docker/php-nginx/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_67b33780223ba0.87435473' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780223ba0.87435473' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_69287be8087c69.73059488' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8087c69.73059488' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyM2JhMC44NzQzNTQ3MyJ9 Dockerfile_67b33780223ba0.87435473' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4N2M2OS43MzA1OTQ4OCJ9 Dockerfile_69287be8087c69.73059488' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3-alpine' @@ -830,10 +968,10 @@ stages: - 'cd docker/php-nginx/8.4' - 'docker build --no-cache -t webdevops/php-nginx:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_67b33780242328.62344667' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780242328.62344667' + - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_69287be809b0e3.29753497' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809b0e3.29753497' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjQyMzI4LjYyMzQ0NjY3In0= Dockerfile_67b33780242328.62344667' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDliMGUzLjI5NzUzNDk3In0= Dockerfile_69287be809b0e3.29753497' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.4' @@ -853,10 +991,10 @@ stages: - 'cd docker/php-nginx/8.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_67b337802218e8.90240500' - - 'echo "COPY conf/ /" >> Dockerfile_67b337802218e8.90240500' + - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_69287be8091e12.87659676' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8091e12.87659676' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyMThlOC45MDI0MDUwMCJ9 Dockerfile_67b337802218e8.90240500' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MWUxMi44NzY1OTY3NiJ9 Dockerfile_69287be8091e12.87659676' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.4-alpine' @@ -866,6 +1004,52 @@ stages: - aws needs: - 'webdevops/php:8.4-alpine' +'webdevops/php-nginx:8.5': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.5' + - 'docker build --no-cache -t webdevops/php-nginx:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_69287be808e5c3.13098686' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808e5c3.13098686' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDhlNWMzLjEzMDk4Njg2In0= Dockerfile_69287be808e5c3.13098686' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.5' + - 'docker tag webdevops/php-nginx:8.5 $CI_REGISTRY_IMAGE/php-nginx:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5' + tags: + - aws + needs: + - 'webdevops/php:8.5' +'webdevops/php-nginx:8.5-alpine': + stage: level3 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx/8.5-alpine' + - 'docker build --no-cache -t webdevops/php-nginx:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_69287be809e644.29403101' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809e644.29403101' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZTY0NC4yOTQwMzEwMSJ9 Dockerfile_69287be809e644.29403101' + - 'cd $CI_PROJECT_DIR/tests/structure-test' + - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml' + - 'docker push webdevops/php-nginx:8.5-alpine' + - 'docker tag webdevops/php-nginx:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/php:8.5-alpine' 'webdevops/apache:alpine': stage: level4 before_script: @@ -876,10 +1060,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_67b33780217d18.60871477' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780217d18.60871477' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_69287be80a1720.16252575' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1720.16252575' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjE3ZDE4LjYwODcxNDc3In0= Dockerfile_67b33780217d18.60871477' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGExNzIwLjE2MjUyNTc1In0= Dockerfile_69287be80a1720.16252575' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -897,10 +1081,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_67b337802174b9.60734934' - - 'echo "COPY conf/ /" >> Dockerfile_67b337802174b9.60734934' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_69287be80a1cc7.66504182' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1cc7.66504182' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTc0YjkuNjA3MzQ5MzQifQ== Dockerfile_67b337802174b9.60734934' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTFjYzcuNjY1MDQxODIifQ== Dockerfile_69287be80a1cc7.66504182' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -920,10 +1104,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_67b33780215755.05460809' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780215755.05460809' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_69287be80a28a2.22679327' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a28a2.22679327' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNTc1NS4wNTQ2MDgwOSJ9 Dockerfile_67b33780215755.05460809' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMjhhMi4yMjY3OTMyNyJ9 Dockerfile_69287be80a28a2.22679327' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -945,10 +1129,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_67b33780217a03.35196981' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780217a03.35196981' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_69287be80a1959.99222454' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1959.99222454' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMTdhMDMuMzUxOTY5ODEifQ== Dockerfile_67b33780217a03.35196981' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTE5NTkuOTkyMjI0NTQifQ== Dockerfile_69287be80a1959.99222454' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -966,10 +1150,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_67b33780250ae3.80578672' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780250ae3.80578672' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_69287be80862d4.18963874' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80862d4.18963874' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyNTBhZTMuODA1Nzg2NzIifQ== Dockerfile_67b33780250ae3.80578672' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODYyZDQuMTg5NjM4NzQifQ== Dockerfile_69287be80862d4.18963874' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -987,10 +1171,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_67b3378023f371.12517127' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023f371.12517127' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_69287be809cf75.27452479' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809cf75.27452479' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjNmMzcxLjEyNTE3MTI3In0= Dockerfile_67b3378023f371.12517127' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDljZjc1LjI3NDUyNDc5In0= Dockerfile_69287be809cf75.27452479' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -1008,10 +1192,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_67b33780225200.47918817' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780225200.47918817' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_69287be8096655.26048753' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8096655.26048753' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjUyMDAuNDc5MTg4MTcifQ== Dockerfile_67b33780225200.47918817' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTY2NTUuMjYwNDg3NTMifQ== Dockerfile_69287be8096655.26048753' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -1029,10 +1213,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_67b3378022e691.08109699' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022e691.08109699' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_69287be8090744.60854462' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8090744.60854462' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjJlNjkxLjA4MTA5Njk5In0= Dockerfile_67b3378022e691.08109699' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDkwNzQ0LjYwODU0NDYyIn0= Dockerfile_69287be8090744.60854462' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -1050,10 +1234,10 @@ stages: - 'cd docker/php-apache-dev/8.3' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_67b33780228158.19260488' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780228158.19260488' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_69287be809f289.20754057' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809f289.20754057' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjgxNTguMTkyNjA0ODgifQ== Dockerfile_67b33780228158.19260488' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWYyODkuMjA3NTQwNTcifQ== Dockerfile_69287be809f289.20754057' - 'docker push webdevops/php-apache-dev:8.3' - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' @@ -1071,10 +1255,10 @@ stages: - 'cd docker/php-apache-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_67b337802235a8.44153401' - - 'echo "COPY conf/ /" >> Dockerfile_67b337802235a8.44153401' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_69287be80875e2.53911766' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80875e2.53911766' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjIzNWE4LjQ0MTUzNDAxIn0= Dockerfile_67b337802235a8.44153401' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg3NWUyLjUzOTExNzY2In0= Dockerfile_69287be80875e2.53911766' - 'docker push webdevops/php-apache-dev:8.3-alpine' - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' @@ -1092,10 +1276,10 @@ stages: - 'cd docker/php-apache-dev/8.4' - 'docker build --no-cache -t webdevops/php-apache-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_67b33780241c27.57841892' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780241c27.57841892' + - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_69287be809aa20.63977001' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809aa20.63977001' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyNDFjMjcuNTc4NDE4OTIifQ== Dockerfile_67b33780241c27.57841892' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWFhMjAuNjM5NzcwMDEifQ== Dockerfile_69287be809aa20.63977001' - 'docker push webdevops/php-apache-dev:8.4' - 'docker tag webdevops/php-apache-dev:8.4 $CI_REGISTRY_IMAGE/php-apache-dev:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4' @@ -1113,10 +1297,10 @@ stages: - 'cd docker/php-apache-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_67b33780221629.96682056' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780221629.96682056' + - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_69287be80915b3.42372894' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80915b3.42372894' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY3YjMzNzgwMjIxNjI5Ljk2NjgyMDU2In0= Dockerfile_67b33780221629.96682056' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDkxNWIzLjQyMzcyODk0In0= Dockerfile_69287be80915b3.42372894' - 'docker push webdevops/php-apache-dev:8.4-alpine' - 'docker tag webdevops/php-apache-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' @@ -1124,6 +1308,48 @@ stages: - aws needs: - 'webdevops/php-apache:8.4-alpine' +'webdevops/php-apache-dev:8.5': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.5' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_69287be808e0f1.57438701' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808e0f1.57438701' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOGUwZjEuNTc0Mzg3MDEifQ== Dockerfile_69287be808e0f1.57438701' + - 'docker push webdevops/php-apache-dev:8.5' + - 'docker tag webdevops/php-apache-dev:8.5 $CI_REGISTRY_IMAGE/php-apache-dev:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5' + tags: + - aws + needs: + - 'webdevops/php-apache:8.5' +'webdevops/php-apache-dev:8.5-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-apache-dev/8.5-alpine' + - 'docker build --no-cache -t webdevops/php-apache-dev:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_69287be809e134.71960535' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809e134.71960535' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDllMTM0LjcxOTYwNTM1In0= Dockerfile_69287be809e134.71960535' + - 'docker push webdevops/php-apache-dev:8.5-alpine' + - 'docker tag webdevops/php-apache-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/php-apache:8.5-alpine' 'webdevops/php-nginx-dev:8.1': stage: level4 before_script: @@ -1134,10 +1360,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_67b33780252b32.59774074' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780252b32.59774074' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_69287be8086e05.96143394' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8086e05.96143394' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI1MmIzMi41OTc3NDA3NCJ9 Dockerfile_67b33780252b32.59774074' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NmUwNS45NjE0MzM5NCJ9 Dockerfile_69287be8086e05.96143394' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -1155,10 +1381,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_67b3378023ff46.25105637' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378023ff46.25105637' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_69287be809d6d0.26709604' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809d6d0.26709604' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyM2ZmNDYuMjUxMDU2MzcifQ== Dockerfile_67b3378023ff46.25105637' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWQ2ZDAuMjY3MDk2MDQifQ== Dockerfile_69287be809d6d0.26709604' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -1176,10 +1402,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_67b33780226136.74226750' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780226136.74226750' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_69287be8096f14.33205603' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8096f14.33205603' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyNjEzNi43NDIyNjc1MCJ9 Dockerfile_67b33780226136.74226750' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NmYxNC4zMzIwNTYwMyJ9 Dockerfile_69287be8096f14.33205603' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -1197,10 +1423,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_67b3378022f051.78820010' - - 'echo "COPY conf/ /" >> Dockerfile_67b3378022f051.78820010' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_69287be8090e95.27561622' + - 'echo "COPY conf/ /" >> Dockerfile_69287be8090e95.27561622' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMmYwNTEuNzg4MjAwMTAifQ== Dockerfile_67b3378022f051.78820010' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTBlOTUuMjc1NjE2MjIifQ== Dockerfile_69287be8090e95.27561622' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -1218,10 +1444,10 @@ stages: - 'cd docker/php-nginx-dev/8.3' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_67b33780228f64.03329939' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780228f64.03329939' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_69287be809fb00.04489363' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809fb00.04489363' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIyOGY2NC4wMzMyOTkzOSJ9 Dockerfile_67b33780228f64.03329939' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZmIwMC4wNDQ4OTM2MyJ9 Dockerfile_69287be809fb00.04489363' - 'docker push webdevops/php-nginx-dev:8.3' - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' @@ -1239,10 +1465,10 @@ stages: - 'cd docker/php-nginx-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_67b33780223fe6.79212619' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780223fe6.79212619' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_69287be80884b6.29968463' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80884b6.29968463' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjNmZTYuNzkyMTI2MTkifQ== Dockerfile_67b33780223fe6.79212619' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODg0YjYuMjk5Njg0NjMifQ== Dockerfile_69287be80884b6.29968463' - 'docker push webdevops/php-nginx-dev:8.3-alpine' - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' @@ -1260,10 +1486,10 @@ stages: - 'cd docker/php-nginx-dev/8.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_67b33780242ab9.24601667' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780242ab9.24601667' + - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_69287be809b396.90126433' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809b396.90126433' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDI0MmFiOS4yNDYwMTY2NyJ9 Dockerfile_67b33780242ab9.24601667' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YjM5Ni45MDEyNjQzMyJ9 Dockerfile_69287be809b396.90126433' - 'docker push webdevops/php-nginx-dev:8.4' - 'docker tag webdevops/php-nginx-dev:8.4 $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' @@ -1281,10 +1507,10 @@ stages: - 'cd docker/php-nginx-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_67b33780221c39.77304607' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780221c39.77304607' + - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_69287be80920f5.83000443' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80920f5.83000443' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjdiMzM3ODAyMjFjMzkuNzczMDQ2MDcifQ== Dockerfile_67b33780221c39.77304607' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTIwZjUuODMwMDA0NDMifQ== Dockerfile_69287be80920f5.83000443' - 'docker push webdevops/php-nginx-dev:8.4-alpine' - 'docker tag webdevops/php-nginx-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' @@ -1292,6 +1518,48 @@ stages: - aws needs: - 'webdevops/php-nginx:8.4-alpine' +'webdevops/php-nginx-dev:8.5': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.5' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5 .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_69287be808e722.96804194' + - 'echo "COPY conf/ /" >> Dockerfile_69287be808e722.96804194' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZTcyMi45NjgwNDE5NCJ9 Dockerfile_69287be808e722.96804194' + - 'docker push webdevops/php-nginx-dev:8.5' + - 'docker tag webdevops/php-nginx-dev:8.5 $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.5' +'webdevops/php-nginx-dev:8.5-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.5-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_69287be809e8c8.17761246' + - 'echo "COPY conf/ /" >> Dockerfile_69287be809e8c8.17761246' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWU4YzguMTc3NjEyNDYifQ== Dockerfile_69287be809e8c8.17761246' + - 'docker push webdevops/php-nginx-dev:8.5-alpine' + - 'docker tag webdevops/php-nginx-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.5-alpine' 'webdevops/vsftp:latest': stage: level4 before_script: @@ -1302,10 +1570,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_67b33780216706.35505941' - - 'echo "COPY conf/ /" >> Dockerfile_67b33780216706.35505941' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_69287be80a2556.99736505' + - 'echo "COPY conf/ /" >> Dockerfile_69287be80a2556.99736505' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82N2IzMzc4MDIxNjcwNi4zNTUwNTk0MSJ9 Dockerfile_67b33780216706.35505941' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMjU1Ni45OTczNjUwNSJ9 Dockerfile_69287be80a2556.99736505' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' diff --git a/README.md b/README.md index 07a5210e8..e89457efd 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ config files from the `provisioning` directory. We generate a multi stage Gitlab-CI configuration using PHP: ``` -docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.3-alpine composer install -docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.3-alpine ci/console gitlab:generate +docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.4-alpine composer install +docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console gitlab:generate ``` Gitlab CI builds every image independent and runs serverspec and structure tests on every @@ -69,31 +69,37 @@ The following images which are currently supported are based on `php:{VER}-fpm-b * `webdevops/php:8.2` * `webdevops/php:8.3` * `webdevops/php:8.4` +* `webdevops/php:8.5` * `webdevops/php-dev:8.0` * `webdevops/php-dev:8.1` * `webdevops/php-dev:8.2` * `webdevops/php-dev:8.3` * `webdevops/php-dev:8.4` +* `webdevops/php-dev:8.5` * `webdevops/php-apache:8.0` * `webdevops/php-apache:8.1` * `webdevops/php-apache:8.2` * `webdevops/php-apache:8.3` * `webdevops/php-apache:8.4` +* `webdevops/php-apache:8.5` * `webdevops/php-apache-dev:8.0` * `webdevops/php-apache-dev:8.1` * `webdevops/php-apache-dev:8.2` * `webdevops/php-apache-dev:8.3` * `webdevops/php-apache-dev:8.4` +* `webdevops/php-apache-dev:8.5` * `webdevops/php-nginx:8.0` * `webdevops/php-nginx:8.1` * `webdevops/php-nginx:8.2` * `webdevops/php-nginx:8.3` * `webdevops/php-nginx:8.4` +* `webdevops/php-nginx:8.5` * `webdevops/php-nginx-dev:8.0` * `webdevops/php-nginx-dev:8.1` * `webdevops/php-nginx-dev:8.2` * `webdevops/php-nginx-dev:8.3` * `webdevops/php-nginx-dev:8.4` +* `webdevops/php-nginx-dev:8.5` ### Alpine PHP @@ -105,28 +111,34 @@ The following images which are currently supported are based on `php:{VER}-fpm-a * `webdevops/php:8.2-alpine` * `webdevops/php:8.3-alpine` * `webdevops/php:8.4-alpine` +* `webdevops/php:8.5-alpine` * `webdevops/php-dev:8.0-alpine` * `webdevops/php-dev:8.1-alpine` * `webdevops/php-dev:8.2-alpine` * `webdevops/php-dev:8.3-alpine` * `webdevops/php-dev:8.4-alpine` +* `webdevops/php-dev:8.5-alpine` * `webdevops/php-apache:8.0-alpine` * `webdevops/php-apache:8.1-alpine` * `webdevops/php-apache:8.2-alpine` * `webdevops/php-apache:8.3-alpine` * `webdevops/php-apache:8.4-alpine` +* `webdevops/php-apache:8.5-alpine` * `webdevops/php-apache-dev:8.0-alpine` * `webdevops/php-apache-dev:8.1-alpine` * `webdevops/php-apache-dev:8.2-alpine` * `webdevops/php-apache-dev:8.3-alpine` * `webdevops/php-apache-dev:8.4-alpine` +* `webdevops/php-apache-dev:8.5-alpine` * `webdevops/php-nginx:8.0-alpine` * `webdevops/php-nginx:8.1-alpine` * `webdevops/php-nginx:8.2-alpine` * `webdevops/php-nginx:8.3-alpine` * `webdevops/php-nginx:8.4-alpine` +* `webdevops/php-nginx:8.5-alpine` * `webdevops/php-nginx-dev:8.0-alpine` * `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` * `webdevops/php-nginx-dev:8.3-alpine` * `webdevops/php-nginx-dev:8.4-alpine` +* `webdevops/php-nginx-dev:8.5-alpine` diff --git a/build-local.sh b/build-local.sh index 89eec063c..f61a80bf3 100755 --- a/build-local.sh +++ b/build-local.sh @@ -3,7 +3,7 @@ set -exuo pipefail ROOT_DIR=$(pwd) -PHP_VERSION=8.4 +PHP_VERSION=8.5 #docker run --rm -ti -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision diff --git a/conf/console.yml b/conf/console.yml index 5dce68647..e4de7f2cf 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,7 +43,7 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php[^:]*:8.(0|1|2|3|4)': + 'php[^:]*:8.(0|1|2|3|4|5)': OS_FAMILY: 'debian' OS_VERSION: '12' PHP_OFFICIAL: '1' diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile b/docker/php-apache-dev/8.5-alpine/Dockerfile new file mode 100644 index 000000000..02781dc8b --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.5-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..8fe68a4c7 --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-apache", "8.5-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.5") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/8.5/Dockerfile b/docker/php-apache-dev/8.5/Dockerfile new file mode 100644 index 000000000..6dd17f1ab --- /dev/null +++ b/docker/php-apache-dev/8.5/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.5 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.5/Dockerfile.jinja2 b/docker/php-apache-dev/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..9f270b4d6 --- /dev/null +++ b/docker/php-apache-dev/8.5/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.5") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.5") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/8.5-alpine/Dockerfile b/docker/php-apache/8.5-alpine/Dockerfile new file mode 100644 index 000000000..de6534a9e --- /dev/null +++ b/docker/php-apache/8.5-alpine/Dockerfile @@ -0,0 +1,33 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apk-install \ + apache2 \ + apache2-ctl \ + apache2-utils \ + apache2-proxy \ + apache2-ssl \ + # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) + && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/httpd.conf \ + && docker-run-bootstrap + +EXPOSE 80 443 diff --git a/docker/php-apache/8.5-alpine/Dockerfile.jinja2 b/docker/php-apache/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..ee9f6d967 --- /dev/null +++ b/docker/php-apache/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "8.5-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.alpine() }} \ + {{ provision.runBootstrap() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f88544c62 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/8.5/Dockerfile b/docker/php-apache/8.5/Dockerfile new file mode 100644 index 000000000..c78820cad --- /dev/null +++ b/docker/php-apache/8.5/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apt-install \ + apache2 \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.5/Dockerfile.jinja2 b/docker/php-apache/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..9863f453d --- /dev/null +++ b/docker/php-apache/8.5/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.5") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.debian12() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.5/conf/bin/service.d/httpd.sh b/docker/php-apache/8.5/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..1d871e7ea --- /dev/null +++ b/docker/php-apache/8.5/conf/bin/service.d/httpd.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.5/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.5/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.5/conf/etc/httpd/global.conf b/docker/php-apache/8.5/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.5/conf/etc/httpd/main.conf b/docker/php-apache/8.5/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.5/conf/etc/httpd/php.conf b/docker/php-apache/8.5/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.5/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.5/conf/etc/httpd/vhost.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.5/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.5/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.5/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.5/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-dev/8.5-alpine/Dockerfile b/docker/php-dev/8.5-alpine/Dockerfile new file mode 100644 index 000000000..b6c94d659 --- /dev/null +++ b/docker/php-dev/8.5-alpine/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5-alpine + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-dev/8.5-alpine/Dockerfile.jinja2 b/docker/php-dev/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..48b55c891 --- /dev/null +++ b/docker/php-dev/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "8.5-alpine") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.5") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.5-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.5-alpine/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.5/Dockerfile b/docker/php-dev/8.5/Dockerfile new file mode 100644 index 000000000..d8e74c867 --- /dev/null +++ b/docker/php-dev/8.5/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.5/Dockerfile.jinja2 b/docker/php-dev/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..fd32f4ad6 --- /dev/null +++ b/docker/php-dev/8.5/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.5") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.5") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile b/docker/php-nginx-dev/8.5-alpine/Dockerfile new file mode 100644 index 000000000..c10f3d35b --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.5-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && apk-install \ + linux-headers \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..42ca5751a --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-nginx", "8.5-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/8.5/Dockerfile b/docker/php-nginx-dev/8.5/Dockerfile new file mode 100644 index 000000000..622a121a2 --- /dev/null +++ b/docker/php-nginx-dev/8.5/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.5 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ + && blackfire php:install \ + && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ + && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ + && apt-install tideways-php tideways-daemon \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.5/Dockerfile.jinja2 b/docker/php-nginx-dev/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..b9e413ae3 --- /dev/null +++ b/docker/php-nginx-dev/8.5/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.5") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.5") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/8.5-alpine/Dockerfile b/docker/php-nginx/8.5-alpine/Dockerfile new file mode 100644 index 000000000..6c00ffcf8 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && apk-install \ + nginx \ + && docker-run-bootstrap + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.5-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..ed91b9f30 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.5-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.alpine() }} \ + {{ provision.runBootstrap() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..b9cb4ebc4 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf @@ -0,0 +1,34 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /docker.stdout; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /docker.stdout main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..b4df6d710 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,6 @@ +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/8.5/Dockerfile b/docker/php-nginx/8.5/Dockerfile new file mode 100644 index 000000000..10fd51d04 --- /dev/null +++ b/docker/php-nginx/8.5/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.5 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + >> /etc/apt/sources.list \ + && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.5/Dockerfile.jinja2 b/docker/php-nginx/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..19f483fee --- /dev/null +++ b/docker/php-nginx/8.5/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.5") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.5/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.5/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.5/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.5/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.5/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.5/conf/etc/nginx/global.conf b/docker/php-nginx/8.5/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.5/conf/etc/nginx/main.conf b/docker/php-nginx/8.5/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.5/conf/etc/nginx/php.conf b/docker/php-nginx/8.5/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..b4df6d710 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.conf @@ -0,0 +1,28 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.5/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,6 @@ +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.5/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.5/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.5/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.5/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index df945418c..99db5a589 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index ee67b29db..d606d24f4 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 2b555bf4c..92d1e74ad 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 0670dda63..6a071c5f1 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 19d9e9799..6c0a8891e 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 065378b3b..1571618ad 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index a8785a913..0db11ca34 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -148,7 +148,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -159,7 +159,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ hash \ pcntl \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index dfb574912..c3d168612 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index aa250416b..0c3537634 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -151,7 +151,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -165,7 +165,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 7df60f658..032d57bc7 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -142,7 +142,7 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 452f79a7d..32eaf9688 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -151,7 +151,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -165,7 +165,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index b22800529..57ac73ccf 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 942ed80a0..0e37ad44a 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 7a2822bc7..2ec1c0c33 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 248c74d63..9741d8784 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -125,7 +125,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ @@ -230,7 +230,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 7442c7672..a27f2ac23 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index bd6d925ed..a18417dcb 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -125,7 +125,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -149,7 +149,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -163,7 +163,7 @@ RUN set -x \ intl \ gettext \ ldap \ - mysqli \ + mysqli \ imap \ pcntl \ pdo_mysql \ @@ -230,7 +230,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index aec235cf1..ee05344af 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -144,7 +144,7 @@ RUN set -x \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile index f79d3d0f6..2d4a8230d 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -125,7 +125,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -148,7 +148,7 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ bz2 \ @@ -228,7 +228,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index f79839c03..a54004327 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile new file mode 100644 index 000000000..b4b775622 --- /dev/null +++ b/docker/php-official/8.5-alpine/Dockerfile @@ -0,0 +1,249 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.5-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.5-fpm-alpine + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + # Add community + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ + # System update + && /usr/local/bin/apk-upgrade \ + # Install base stuff + && apk-install \ + bash \ + ca-certificates \ + openssl \ + && update-ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ + ## Fix su execution (eg for tests) + && mkdir -p /etc/pam.d/ \ + && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su + +RUN set -x \ + # Install services + && chmod +x /opt/docker/bin/* \ + && apk-install \ + supervisor \ + wget \ + curl \ + vim \ + sed \ + tzdata \ + busybox-suid \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap + +RUN set -x \ + && apk-install shadow \ + && apk-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + drill \ + ldns \ + openssh-client \ + rsync \ + patch \ + git \ + && docker-run-bootstrap + +RUN set -x \ + # Install php environment + && apk-install \ + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + pngcrush \ + optipng \ + pngquant \ + vips \ + rabbitmq-c \ + c-client \ + # Libraries + libldap \ + icu-libs \ + libintl \ + libpq \ + libxslt \ + libgomp \ + libzip \ + libmemcached \ + yaml \ + # Build dependencies + linux-headers \ + autoconf \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + imagemagick-dev \ + rabbitmq-c-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + samba-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # https://github.com/docker-library/php/issues/240 + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + ftp \ + gmp \ + ffi \ + imagick \ + amqp \ + intl \ + gettext \ + ldap \ + mysqli \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Install extensions for PHP 7.x + # Memcached for 7.3 can currently only be built from master + && MEMCACHED="`mktemp -d`" \ + && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ + && docker-php-ext-configure $MEMCACHED \ + && docker-php-ext-install $MEMCACHED \ + && rm -rf $MEMCACHED \ + && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ + && pecl install vips \ + && pecl install yaml \ + && pecl install redis \ + && pecl install mongodb \ + && pecl install xmlrpc-1.0.0RC3 \ + && docker-php-ext-enable \ + apcu \ + excimer \ + opentelemetry \ + protobuf \ + vips \ + yaml \ + redis \ + xmlrpc \ + imagick \ + mongodb \ + # Uninstall dev and header packages + && apk del -f --purge \ + autoconf \ + linux-headers \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + gmp-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + rabbitmq-c-dev \ + imagemagick-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + samba-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.5-alpine/Dockerfile.jinja2 b/docker/php-official/8.5-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..a8f0f2425 --- /dev/null +++ b/docker/php-official/8.5-alpine/Dockerfile.jinja2 @@ -0,0 +1,35 @@ + +{{ docker.fromOfficial("php", "8.5-fpm-alpine") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} +{{ environment.phpAlpineIconvWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.alpine('3.20') }} + +RUN set -x \ + {{ base.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ baseapp.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ php.officialAlpine(version='8.5') }} \ + {{ provision.runBootstrap() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.5-alpine/conf/VERSION b/docker/php-official/8.5-alpine/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.5-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.5-alpine/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.5-alpine/conf/bin/config.sh b/docker/php-official/8.5-alpine/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.5-alpine/conf/bin/control.sh b/docker/php-official/8.5-alpine/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.5-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.5-alpine/conf/bin/provision b/docker/php-official/8.5-alpine/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.5-alpine/conf/bin/provision.py b/docker/php-official/8.5-alpine/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..5af135768 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/service b/docker/php-official/8.5-alpine/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/etc/php/php.ini b/docker/php-official/8.5-alpine/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.5-alpine/conf/provision/ansible.cfg b/docker/php-official/8.5-alpine/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..7a7b42f6b --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Add group +addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" + diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..71caa48d3 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu|Alpine) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..4a348a38a --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + +echo "Installing ionCube loader" + +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.5-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.5-alpine/conf/provision/variables.yml b/docker/php-official/8.5-alpine/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.5-alpine/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile new file mode 100644 index 000000000..97fd3e441 --- /dev/null +++ b/docker/php-official/8.5/Dockerfile @@ -0,0 +1,227 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.5 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.5-fpm-bookworm + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + gnupg + +RUN set -x \ + # Install packages + && chmod +x /opt/docker/bin/* \ + && apt-install \ + supervisor \ + wget \ + curl \ + vim \ + net-tools \ + tzdata \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install services + && apt-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + patch \ + && /usr/local/bin/generate-locales \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + libjpeg-turbo-progs \ + pngcrush \ + optipng \ + apngopt \ + pngnq \ + pngquant \ + # Libraries + libvips42 \ + librabbitmq4 \ + libldap-2.5-0 \ + libxslt1.1 \ + libldap-common \ + zlib1g \ + libpq5 \ + libpng16-16 \ + libmcrypt4 \ + libzip4 \ + # Dev and headers + libjpeg62-turbo-dev \ + libwebp-dev \ + libfreetype6-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + libc-client-dev \ + libc-client2007e-dev \ + libkrb5-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-install \ + bcmath \ + amqp \ + imagick \ + ffi \ + bz2 \ + calendar \ + exif \ + ftp \ + gmp \ + intl \ + gettext \ + ldap \ + mysqli \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + && pecl install memcached \ + && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf \ + && pecl install xmlrpc-1.0.0RC3 \ + && pecl install vips \ + && pecl install redis \ + && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ + && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ + && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libc-client-dev \ + libkrb5-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng-dev \ + libwebp-dev \ + libpq-dev \ + libzip-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + libgmp-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.5/Dockerfile.jinja2 b/docker/php-official/8.5/Dockerfile.jinja2 new file mode 100644 index 000000000..549d2056d --- /dev/null +++ b/docker/php-official/8.5/Dockerfile.jinja2 @@ -0,0 +1,37 @@ + +{{ docker.fromOfficial("php", "8.5-fpm-bookworm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.debian('bookworm') }} + +RUN set -x \ + {{ base.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.official(version='8.5',distribution='bookworm') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.5/conf/VERSION b/docker/php-official/8.5/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.5/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.5/conf/bin/bootstrap.sh b/docker/php-official/8.5/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.5/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.5/conf/bin/config.sh b/docker/php-official/8.5/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.5/conf/bin/control.sh b/docker/php-official/8.5/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.5/conf/bin/entrypoint.sh b/docker/php-official/8.5/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.5/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.5/conf/bin/provision b/docker/php-official/8.5/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.5/conf/bin/provision.py b/docker/php-official/8.5/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.5/conf/bin/service.d/cron.sh b/docker/php-official/8.5/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..b5fa80dd3 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.5/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.5/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.5/conf/bin/service.d/postfix.sh b/docker/php-official/8.5/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.5/conf/bin/service.d/ssh.sh b/docker/php-official/8.5/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.5/conf/bin/service.d/supervisor.sh b/docker/php-official/8.5/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-provision b/docker/php-official/8.5/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service b/docker/php-official/8.5/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.5/conf/bin/usr-bin/service b/docker/php-official/8.5/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.5/conf/bin/usr-bin/version-compare b/docker/php-official/8.5/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.5/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.5/conf/etc/cron/.gitkeep b/docker/php-official/8.5/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.5/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/etc/php/php.ini b/docker/php-official/8.5/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.5/conf/etc/php/php.webdevops.ini b/docker/php-official/8.5/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.5/conf/etc/supervisor.conf b/docker/php-official/8.5/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.5/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.5/conf/provision/ansible.cfg b/docker/php-official/8.5/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..5bc865e80 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Add group +groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" + +# Assign user to group +usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..c1e716300 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..4a348a38a --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + +echo "Installing ionCube loader" + +DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.5/conf/provision/build.d/.gitkeep b/docker/php-official/8.5/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.5/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.5/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/roles/.gitkeep b/docker/php-official/8.5/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/service.d/.gitkeep b/docker/php-official/8.5/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.5/conf/provision/service.d/cron.sh b/docker/php-official/8.5/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.5/conf/provision/service.d/postfix.sh b/docker/php-official/8.5/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.5/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.5/conf/provision/service.d/ssh.sh b/docker/php-official/8.5/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.5/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.5/conf/provision/service.d/syslog.sh b/docker/php-official/8.5/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.5/conf/provision/variables-webdevops.yml b/docker/php-official/8.5/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.5/conf/provision/variables.yml b/docker/php-official/8.5/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.5/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.5 b/docker/php/8.5 new file mode 120000 index 000000000..a0754b593 --- /dev/null +++ b/docker/php/8.5 @@ -0,0 +1 @@ +../php-official/8.5 \ No newline at end of file diff --git a/docker/php/8.5-alpine b/docker/php/8.5-alpine new file mode 120000 index 000000000..d3fc8eeba --- /dev/null +++ b/docker/php/8.5-alpine @@ -0,0 +1 @@ +../php-official/8.5-alpine \ No newline at end of file diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst index a7f2bb797..c010499b2 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -12,6 +12,7 @@ Tag Distribution name PHP Version ``8.2`` *customized official php image* PHP 8.2 ``8.3`` *customized official php image* PHP 8.3 ``8.4`` *customized official php image* PHP 8.4 +``8.5`` *customized official php image* PHP 8.5 ``7.1-alpine`` *deprecated* PHP 7.1 ``7.2-alpine`` *deprecated* PHP 7.2 ``7.3-alpine`` *deprecated* PHP 7.3 @@ -21,6 +22,7 @@ Tag Distribution name PHP Version ``8.2-alpine`` *customized official php image* PHP 8.2 ``8.3-alpine`` *customized official php image* PHP 8.3 ``8.4-alpine`` *customized official php image* PHP 8.4 +``8.5-alpine`` *customized official php image* PHP 8.5 ``alpine`` *deprecated* PHP 7.x ``alpine-php7`` *deprecated* PHP 7.x ``alpine-php5`` *deprecated* PHP 5.6 diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 87f6501ae..4d86bfed9 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -65,25 +65,25 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- else %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ -{%- if version != '8.4' %} +{%- if version != '8.4' and version != '8.5' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ -{%- endif %} +{%- endif %} && docker-php-ext-install \ bcmath \ -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} amqp \ imagick \ ffi \ @@ -100,10 +100,10 @@ {%- if version|int == 5 or version == '7.0' or version == '7.1' %} mcrypt \ {%- endif %} -{%- if version != '8.4' %} +{%- if version != '8.4' and version != '8.5' %} imap \ {%- endif %} -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} hash \ {%- endif %} pcntl \ @@ -112,14 +112,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} xmlrpc \ {%- endif %} xsl \ @@ -139,7 +139,7 @@ && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ -{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install memcached \ && pecl install apcu \ && pecl install excimer \ @@ -248,7 +248,11 @@ icu-dev \ postgresql-dev \ libxml2-dev \ + {%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} + samba-dev \ + {%- else %} ldb-dev \ + {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ @@ -266,7 +270,7 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ @@ -277,9 +281,9 @@ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- endif %} && docker-php-ext-configure ldap \ -{%- if version != '8.4' %} +{%- if version != '8.4' and version != '8.5' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ -{%- endif %} +{%- endif %} && docker-php-ext-install \ bcmath \ bz2 \ @@ -287,7 +291,7 @@ exif \ ftp \ gmp \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} ffi \ imagick \ amqp \ @@ -296,10 +300,10 @@ gettext \ ldap \ mysqli \ -{%- if version != '8.4' %} +{%- if version != '8.4' and version != '8.5' %} imap \ -{%- endif %} -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- endif %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} hash \ {%- endif %} pcntl \ @@ -308,14 +312,14 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} tokenizer \ {%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %} +{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} xmlrpc \ {%- endif %} xsl \ @@ -324,7 +328,7 @@ gettext \ opcache \ # Install extensions for PHP 7.x - {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} + {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ @@ -335,7 +339,7 @@ && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ && docker-php-ext-enable memcached \ {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ @@ -398,7 +402,11 @@ icu-dev \ postgresql-dev \ libxml2-dev \ + {%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} + samba-dev \ + {%- else %} ldb-dev \ + {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ @@ -420,7 +428,7 @@ && apt-install tideways-php tideways-daemon \ {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} + {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ From 0e8ace59b5a83454351ef5d8efa158f3be3aee52 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 1 Dec 2025 15:38:25 +0100 Subject: [PATCH 52/63] =?UTF-8?q?=F0=9F=90=9B=20fix=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove opcache for php 8.5 as it is included. use pie to install alpha3 of xdebug 3.5.0 (as only it is compatible with php 8.5) do not install amqp as it is not compatbile with 8.5 at all --- docker/php-apache-dev/8.5-alpine/Dockerfile | 5 +++- docker/php-apache-dev/8.5/Dockerfile | 5 +++- docker/php-dev/8.5-alpine/Dockerfile | 5 +++- docker/php-dev/8.5/Dockerfile | 5 +++- .../8.3-alpine/Dockerfile.jinja2 | 2 +- .../8.4-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.5-alpine/Dockerfile | 5 +++- .../8.5-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.5/Dockerfile | 5 +++- docker/php-official/5.6/Dockerfile | 1 - docker/php-official/7.0/Dockerfile | 1 - docker/php-official/7.1-alpine/Dockerfile | 1 - docker/php-official/7.1/Dockerfile | 1 - docker/php-official/7.2-alpine/Dockerfile | 1 - docker/php-official/7.2/Dockerfile | 1 - docker/php-official/7.3-alpine/Dockerfile | 1 - docker/php-official/7.3/Dockerfile | 1 - docker/php-official/7.4-alpine/Dockerfile | 1 - docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 1 - docker/php-official/8.0/Dockerfile | 1 - docker/php-official/8.1-alpine/Dockerfile | 1 - docker/php-official/8.1/Dockerfile | 1 - docker/php-official/8.2-alpine/Dockerfile | 1 - docker/php-official/8.2/Dockerfile | 1 - docker/php-official/8.3-alpine/Dockerfile | 1 - docker/php-official/8.3/Dockerfile | 1 - docker/php-official/8.4-alpine/Dockerfile | 1 - docker/php-official/8.4/Dockerfile | 1 - docker/php-official/8.5-alpine/Dockerfile | 5 +--- docker/php-official/8.5/Dockerfile | 5 +--- template/Dockerfile/images/php.jinja2 | 24 +++++++++++++++---- 32 files changed, 50 insertions(+), 41 deletions(-) diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile b/docker/php-apache-dev/8.5-alpine/Dockerfile index 02781dc8b..37e099787 100644 --- a/docker/php-apache-dev/8.5-alpine/Dockerfile +++ b/docker/php-apache-dev/8.5-alpine/Dockerfile @@ -24,7 +24,10 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-apache-dev/8.5/Dockerfile b/docker/php-apache-dev/8.5/Dockerfile index 6dd17f1ab..2ec49830d 100644 --- a/docker/php-apache-dev/8.5/Dockerfile +++ b/docker/php-apache-dev/8.5/Dockerfile @@ -22,7 +22,10 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-dev/8.5-alpine/Dockerfile b/docker/php-dev/8.5-alpine/Dockerfile index b6c94d659..dd401c67c 100644 --- a/docker/php-dev/8.5-alpine/Dockerfile +++ b/docker/php-dev/8.5-alpine/Dockerfile @@ -16,7 +16,10 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-dev/8.5/Dockerfile b/docker/php-dev/8.5/Dockerfile index d8e74c867..deb49e2c4 100644 --- a/docker/php-dev/8.5/Dockerfile +++ b/docker/php-dev/8.5/Dockerfile @@ -14,7 +14,10 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 index 4ae7147e4..81e512b17 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -7,5 +7,5 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ php.officialDevelopmentAlpine(version="8.3") }} \ {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 index 4170b720f..0c59288ac 100644 --- a/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.4-alpine/Dockerfile.jinja2 @@ -7,5 +7,5 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ php.officialDevelopmentAlpine(version="8.4") }} \ {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile b/docker/php-nginx-dev/8.5-alpine/Dockerfile index c10f3d35b..ba94eeecf 100644 --- a/docker/php-nginx-dev/8.5-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile @@ -24,7 +24,10 @@ RUN set -x \ make \ autoconf \ g++ \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 index 42ca5751a..b44bb2998 100644 --- a/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile.jinja2 @@ -7,5 +7,5 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.2") }} \ + {{ php.officialDevelopmentAlpine(version="8.5") }} \ {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.5/Dockerfile b/docker/php-nginx-dev/8.5/Dockerfile index 622a121a2..103fe1f26 100644 --- a/docker/php-nginx-dev/8.5/Dockerfile +++ b/docker/php-nginx-dev/8.5/Dockerfile @@ -22,7 +22,10 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 99db5a589..1f0338312 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -172,7 +172,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 5.x && pecl install apcu-4.0.11 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index d606d24f4..c93cc525d 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -172,7 +172,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && pecl install apcu \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 92d1e74ad..b048bdd55 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -177,7 +177,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 6a071c5f1..228fe7191 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -172,7 +172,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && pecl install apcu \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 6c0a8891e..9c576f6f8 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -177,7 +177,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 1571618ad..0b0fb6f14 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -171,7 +171,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && pecl install apcu \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 0db11ca34..8204398a6 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -177,7 +177,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index c3d168612..081ab7660 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -171,7 +171,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && pecl install apcu \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 0c3537634..bc0458a51 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -182,7 +182,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 032d57bc7..9db5049bc 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -145,6 +145,7 @@ RUN set -x \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ + amqp \ bz2 \ calendar \ exif \ @@ -170,7 +171,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x && pecl install apcu \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 32eaf9688..5667a398e 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -181,7 +181,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 57ac73ccf..fd2e752ee 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 0e37ad44a..a7af18f09 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -178,7 +178,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 2ec1c0c33..d1c15bdd3 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -173,7 +173,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 9741d8784..8309a82fd 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -178,7 +178,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index a27f2ac23..23b67b6cf 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -173,7 +173,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index a18417dcb..79aaf7bbb 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -178,7 +178,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index ee05344af..93c27f604 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -173,7 +173,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile index 2d4a8230d..9aa55af3d 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -176,7 +176,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index a54004327..5f607f7a7 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -171,7 +171,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile index b4b775622..77c16ed38 100644 --- a/docker/php-official/8.5-alpine/Dockerfile +++ b/docker/php-official/8.5-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -158,7 +158,6 @@ RUN set -x \ gmp \ ffi \ imagick \ - amqp \ intl \ gettext \ ldap \ @@ -176,8 +175,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ - opcache \ # Install extensions for PHP 7.x # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile index 97fd3e441..5a407cbcd 100644 --- a/docker/php-official/8.5/Dockerfile +++ b/docker/php-official/8.5/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -146,7 +146,6 @@ RUN set -x \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install \ bcmath \ - amqp \ imagick \ ffi \ bz2 \ @@ -171,8 +170,6 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ - opcache \ && pecl install memcached \ && pecl install apcu \ && pecl install excimer \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 4d86bfed9..3079047af 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -83,8 +83,10 @@ {%- endif %} && docker-php-ext-install \ bcmath \ -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} amqp \ +{%- endif %} +{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} imagick \ ffi \ {%- endif %} @@ -125,8 +127,9 @@ xsl \ zip \ gd \ - gettext \ +{%- if version != '8.5' %} opcache \ +{%- endif %} {%- if version|int == 5 %} # Install extensions for PHP 5.x && pecl install apcu-4.0.11 \ @@ -294,6 +297,8 @@ {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} ffi \ imagick \ +{%- endif %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} amqp \ {%- endif %} intl \ @@ -325,8 +330,9 @@ xsl \ zip \ gd \ - gettext \ +{%- if version != '8.5' %} opcache \ +{%- endif %} # Install extensions for PHP 7.x {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} # Memcached for 7.3 can currently only be built from master @@ -428,7 +434,12 @@ && apt-install tideways-php tideways-daemon \ {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} + {%- elif version == '8.5' %} + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ + {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ @@ -454,6 +465,11 @@ && pecl install xdebug-2.5.5 \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ + {%- elif version == '8.5' %} + && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie install xdebug/xdebug:^3.5.0@alpha \ + && rm -f /usr/local/bin/pie \ {%- elif version == '7.4' %} && pecl install xdebug-3.1.6 \ {%- else %} From 97d91e516ffb71d558408394b5573a918c18dfbf Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 9 Dec 2025 07:35:48 +0100 Subject: [PATCH 53/63] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20rewert=20to=20using?= =?UTF-8?q?=20pecl=20for=20xdebug=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/php-apache-dev/8.5/Dockerfile | 5 +---- docker/php-dev/8.5/Dockerfile | 5 +---- docker/php-nginx-dev/8.5/Dockerfile | 5 +---- template/Dockerfile/images/php.jinja2 | 7 +------ 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/docker/php-apache-dev/8.5/Dockerfile b/docker/php-apache-dev/8.5/Dockerfile index 2ec49830d..6dd17f1ab 100644 --- a/docker/php-apache-dev/8.5/Dockerfile +++ b/docker/php-apache-dev/8.5/Dockerfile @@ -22,10 +22,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-dev/8.5/Dockerfile b/docker/php-dev/8.5/Dockerfile index deb49e2c4..d8e74c867 100644 --- a/docker/php-dev/8.5/Dockerfile +++ b/docker/php-dev/8.5/Dockerfile @@ -14,10 +14,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/docker/php-nginx-dev/8.5/Dockerfile b/docker/php-nginx-dev/8.5/Dockerfile index 103fe1f26..622a121a2 100644 --- a/docker/php-nginx-dev/8.5/Dockerfile +++ b/docker/php-nginx-dev/8.5/Dockerfile @@ -22,10 +22,7 @@ RUN set -x \ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && docker-php-ext-enable xdebug \ # Enable php development services && docker-service enable syslog \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 3079047af..f4f57bb32 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -434,12 +434,7 @@ && apt-install tideways-php tideways-daemon \ {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.5' %} - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} + {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ From ebc4fac5b743e717ab64c165edd3b8bbc6537377 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 19 Jan 2026 15:38:50 +0100 Subject: [PATCH 54/63] =?UTF-8?q?=F0=9F=90=9B=20use=20gitlabs=20runner=20i?= =?UTF-8?q?nstead=20of=20custom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 558 ++++++++++++++++-------------------------- ci/src/JobBuilder.php | 2 +- 2 files changed, 208 insertions(+), 352 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bf93863e..51b5b11fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,6 @@ stages: - 'docker push webdevops/toolbox:latest' - 'docker tag webdevops/toolbox:latest $CI_REGISTRY_IMAGE/toolbox:latest' - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' - tags: - - aws 'webdevops/bootstrap:alpine': stage: level2 before_script: @@ -28,17 +26,15 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_69287be80a1128.04599452' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1128.04599452' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_696e41bf715e49.28746787' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf715e49.28746787' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGExMTI4LjA0NTk5NDUyIn0= Dockerfile_69287be80a1128.04599452' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE1ZTQ5LjI4NzQ2Nzg3In0= Dockerfile_696e41bf715e49.28746787' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/bootstrap:ubuntu-22.04': @@ -51,10 +47,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_69287be80a1fd9.42714191' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1fd9.42714191' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_696e41bf716ce1.41077306' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf716ce1.41077306' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTFmZDkuNDI3MTQxOTEifQ== Dockerfile_69287be80a1fd9.42714191' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTZjZTEuNDEwNzczMDYifQ== Dockerfile_696e41bf716ce1.41077306' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -62,8 +58,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' - 'docker push webdevops/bootstrap:latest' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.1': @@ -76,10 +70,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_69287be80857d1.86702937' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80857d1.86702937' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_696e41bf6f49d7.91458876' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f49d7.91458876' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg1N2QxLjg2NzAyOTM3In0= Dockerfile_69287be80857d1.86702937' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY0OWQ3LjkxNDU4ODc2In0= Dockerfile_696e41bf6f49d7.91458876' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -87,8 +81,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.1' - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' - 'docker push webdevops/php-official:8.1' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.1-alpine': @@ -101,10 +93,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_69287be809c8c1.98352639' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809c8c1.98352639' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_696e41bf7108a3.56249255' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7108a3.56249255' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YzhjMS45ODM1MjYzOSJ9 Dockerfile_69287be809c8c1.98352639' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMDhhMy41NjI0OTI1NSJ9 Dockerfile_696e41bf7108a3.56249255' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -112,8 +104,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - 'docker push webdevops/php-official:8.1-alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.2': @@ -126,10 +116,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_69287be8095ea5.80219908' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8095ea5.80219908' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_696e41bf708099.97589782' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708099.97589782' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDk1ZWE1LjgwMjE5OTA4In0= Dockerfile_69287be8095ea5.80219908' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzA4MDk5Ljk3NTg5NzgyIn0= Dockerfile_696e41bf708099.97589782' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -137,8 +127,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - 'docker push webdevops/php-official:8.2' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.2-alpine': @@ -151,10 +139,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_69287be808fcf5.62609062' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808fcf5.62609062' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_696e41bf700ff4.24016900' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf700ff4.24016900' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZmNmNS42MjYwOTA2MiJ9 Dockerfile_69287be808fcf5.62609062' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMGZmNC4yNDAxNjkwMCJ9 Dockerfile_696e41bf700ff4.24016900' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -162,8 +150,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' - 'docker push webdevops/php-official:8.2-alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.3': @@ -176,10 +162,10 @@ stages: - 'cd docker/php-official/8.3' - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_69287be809ec52.80068095' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809ec52.80068095' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_696e41bf713bc8.10046836' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713bc8.10046836' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDllYzUyLjgwMDY4MDk1In0= Dockerfile_69287be809ec52.80068095' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzEzYmM4LjEwMDQ2ODM2In0= Dockerfile_696e41bf713bc8.10046836' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - 'docker push webdevops/php:8.3' @@ -187,8 +173,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.3' - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' - 'docker push webdevops/php-official:8.3' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.3-alpine': @@ -201,10 +185,10 @@ stages: - 'cd docker/php-official/8.3-alpine' - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_69287be8087197.84499594' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8087197.84499594' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_696e41bf6f7002.48429078' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7002.48429078' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NzE5Ny44NDQ5OTU5NCJ9 Dockerfile_69287be8087197.84499594' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNzAwMi40ODQyOTA3OCJ9 Dockerfile_696e41bf6f7002.48429078' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - 'docker push webdevops/php:8.3-alpine' @@ -212,8 +196,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' - 'docker push webdevops/php-official:8.3-alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.4': @@ -226,10 +208,10 @@ stages: - 'cd docker/php-official/8.4' - 'docker build --no-cache -t webdevops/php:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4" >> Dockerfile_69287be809a362.88889011' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809a362.88889011' + - 'echo "FROM webdevops/php:8.4" >> Dockerfile_696e41bf70c101.58709433' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70c101.58709433' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDlhMzYyLjg4ODg5MDExIn0= Dockerfile_69287be809a362.88889011' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzBjMTAxLjU4NzA5NDMzIn0= Dockerfile_696e41bf70c101.58709433' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml' - 'docker push webdevops/php:8.4' @@ -237,8 +219,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.4' - 'docker tag webdevops/php:8.4 webdevops/php-official:8.4' - 'docker push webdevops/php-official:8.4' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.4-alpine': @@ -251,10 +231,10 @@ stages: - 'cd docker/php-official/8.4-alpine' - 'docker build --no-cache -t webdevops/php:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_69287be8091162.95273204' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8091162.95273204' + - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_696e41bf702a37.11277934' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702a37.11277934' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MTE2Mi45NTI3MzIwNCJ9 Dockerfile_69287be8091162.95273204' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMmEzNy4xMTI3NzkzNCJ9 Dockerfile_696e41bf702a37.11277934' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml' - 'docker push webdevops/php:8.4-alpine' @@ -262,8 +242,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.4-alpine' - 'docker tag webdevops/php:8.4-alpine webdevops/php-official:8.4-alpine' - 'docker push webdevops/php-official:8.4-alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.5': @@ -276,10 +254,10 @@ stages: - 'cd docker/php-official/8.5' - 'docker build --no-cache -t webdevops/php:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.5" >> Dockerfile_69287be808d961.29259230' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808d961.29259230' + - 'echo "FROM webdevops/php:8.5" >> Dockerfile_696e41bf6fe7a5.53256182' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fe7a5.53256182' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDhkOTYxLjI5MjU5MjMwIn0= Dockerfile_69287be808d961.29259230' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmZlN2E1LjUzMjU2MTgyIn0= Dockerfile_696e41bf6fe7a5.53256182' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml' - 'docker push webdevops/php:8.5' @@ -287,8 +265,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.5' - 'docker tag webdevops/php:8.5 webdevops/php-official:8.5' - 'docker push webdevops/php-official:8.5' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/php:8.5-alpine': @@ -301,10 +277,10 @@ stages: - 'cd docker/php-official/8.5-alpine' - 'docker build --no-cache -t webdevops/php:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_69287be809da51.55661187' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809da51.55661187' + - 'echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_696e41bf7127d2.56598904' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7127d2.56598904' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZGE1MS41NTY2MTE4NyJ9 Dockerfile_69287be809da51.55661187' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMjdkMi41NjU5ODkwNCJ9 Dockerfile_696e41bf7127d2.56598904' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml' - 'docker push webdevops/php:8.5-alpine' @@ -312,8 +288,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/php:8.5-alpine' - 'docker tag webdevops/php:8.5-alpine webdevops/php-official:8.5-alpine' - 'docker push webdevops/php-official:8.5-alpine' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/storage:latest': @@ -328,8 +302,6 @@ stages: - 'docker push webdevops/storage:latest' - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' - 'docker push $CI_REGISTRY_IMAGE/storage:latest' - tags: - - aws needs: - 'webdevops/toolbox:latest' 'webdevops/base:alpine': @@ -342,17 +314,15 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_69287be80a1420.37249045' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1420.37249045' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_696e41bf7160e6.29634751' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7160e6.29634751' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMTQyMC4zNzI0OTA0NSJ9 Dockerfile_69287be80a1420.37249045' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNjBlNi4yOTYzNDc1MSJ9 Dockerfile_696e41bf7160e6.29634751' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - 'docker push $CI_REGISTRY_IMAGE/base:alpine' - tags: - - aws needs: - 'webdevops/bootstrap:alpine' 'webdevops/base:ubuntu-22.04': @@ -365,10 +335,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_69287be80a2271.41603408' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a2271.41603408' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_696e41bf717072.29744626' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717072.29744626' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGEyMjcxLjQxNjAzNDA4In0= Dockerfile_69287be80a2271.41603408' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE3MDcyLjI5NzQ0NjI2In0= Dockerfile_696e41bf717072.29744626' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -376,8 +346,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' - 'docker push webdevops/base:latest' - tags: - - aws needs: - 'webdevops/bootstrap:ubuntu-22.04' 'webdevops/php-apache:8.1': @@ -390,15 +358,13 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_69287be8086040.55246786' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8086040.55246786' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_696e41bf6f4ee3.86314782' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f4ee3.86314782' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NjA0MC41NTI0Njc4NiJ9 Dockerfile_69287be8086040.55246786' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNGVlMy44NjMxNDc4MiJ9 Dockerfile_696e41bf6f4ee3.86314782' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' - tags: - - aws needs: - 'webdevops/php:8.1' 'webdevops/php-apache:8.1-alpine': @@ -411,15 +377,13 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_69287be809cc84.38539116' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809cc84.38539116' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_696e41bf711460.00724786' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711460.00724786' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWNjODQuMzg1MzkxMTYifQ== Dockerfile_69287be809cc84.38539116' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTE0NjAuMDA3MjQ3ODYifQ== Dockerfile_696e41bf711460.00724786' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - tags: - - aws needs: - 'webdevops/php:8.1-alpine' 'webdevops/php-apache:8.2': @@ -432,15 +396,13 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_69287be8096356.83522689' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8096356.83522689' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_696e41bf708487.81740578' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708487.81740578' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NjM1Ni44MzUyMjY4OSJ9 Dockerfile_69287be8096356.83522689' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwODQ4Ny44MTc0MDU3OCJ9 Dockerfile_696e41bf708487.81740578' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' - tags: - - aws needs: - 'webdevops/php:8.2' 'webdevops/php-apache:8.2-alpine': @@ -453,15 +415,13 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_69287be80902c8.44617894' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80902c8.44617894' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_696e41bf7016f6.25944727' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7016f6.25944727' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTAyYzguNDQ2MTc4OTQifQ== Dockerfile_69287be80902c8.44617894' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDE2ZjYuMjU5NDQ3MjcifQ== Dockerfile_696e41bf7016f6.25944727' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - tags: - - aws needs: - 'webdevops/php:8.2-alpine' 'webdevops/php-apache:8.3': @@ -474,15 +434,13 @@ stages: - 'cd docker/php-apache/8.3' - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_69287be809ef34.66930314' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809ef34.66930314' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_696e41bf713d71.80728564' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713d71.80728564' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZWYzNC42NjkzMDMxNCJ9 Dockerfile_69287be809ef34.66930314' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxM2Q3MS44MDcyODU2NCJ9 Dockerfile_696e41bf713d71.80728564' - 'docker push webdevops/php-apache:8.3' - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' - tags: - - aws needs: - 'webdevops/php:8.3' 'webdevops/php-apache:8.3-alpine': @@ -495,15 +453,13 @@ stages: - 'cd docker/php-apache/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_69287be8087379.30688170' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8087379.30688170' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_696e41bf6f7711.41882184' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7711.41882184' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODczNzkuMzA2ODgxNzAifQ== Dockerfile_69287be8087379.30688170' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2Zjc3MTEuNDE4ODIxODQifQ== Dockerfile_696e41bf6f7711.41882184' - 'docker push webdevops/php-apache:8.3-alpine' - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - tags: - - aws needs: - 'webdevops/php:8.3-alpine' 'webdevops/php-apache:8.4': @@ -516,15 +472,13 @@ stages: - 'cd docker/php-apache/8.4' - 'docker build --no-cache -t webdevops/php-apache:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_69287be809a659.15912536' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809a659.15912536' + - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_696e41bf70c262.97404682' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70c262.97404682' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YTY1OS4xNTkxMjUzNiJ9 Dockerfile_69287be809a659.15912536' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwYzI2Mi45NzQwNDY4MiJ9 Dockerfile_696e41bf70c262.97404682' - 'docker push webdevops/php-apache:8.4' - 'docker tag webdevops/php-apache:8.4 $CI_REGISTRY_IMAGE/php-apache:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4' - tags: - - aws needs: - 'webdevops/php:8.4' 'webdevops/php-apache:8.4-alpine': @@ -537,15 +491,13 @@ stages: - 'cd docker/php-apache/8.4-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_69287be8091443.98815882' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8091443.98815882' + - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_696e41bf702c66.83759887' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702c66.83759887' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTE0NDMuOTg4MTU4ODIifQ== Dockerfile_69287be8091443.98815882' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDJjNjYuODM3NTk4ODcifQ== Dockerfile_696e41bf702c66.83759887' - 'docker push webdevops/php-apache:8.4-alpine' - 'docker tag webdevops/php-apache:8.4-alpine $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' - tags: - - aws needs: - 'webdevops/php:8.4-alpine' 'webdevops/php-apache:8.5': @@ -558,15 +510,13 @@ stages: - 'cd docker/php-apache/8.5' - 'docker build --no-cache -t webdevops/php-apache:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.5" >> Dockerfile_69287be808dde1.87460582' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808dde1.87460582' + - 'echo "FROM webdevops/php-apache:8.5" >> Dockerfile_696e41bf6fe9f3.56404781' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fe9f3.56404781' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZGRlMS44NzQ2MDU4MiJ9 Dockerfile_69287be808dde1.87460582' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZTlmMy41NjQwNDc4MSJ9 Dockerfile_696e41bf6fe9f3.56404781' - 'docker push webdevops/php-apache:8.5' - 'docker tag webdevops/php-apache:8.5 $CI_REGISTRY_IMAGE/php-apache:8.5' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5' - tags: - - aws needs: - 'webdevops/php:8.5' 'webdevops/php-apache:8.5-alpine': @@ -579,15 +529,13 @@ stages: - 'cd docker/php-apache/8.5-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_69287be809de48.62884443' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809de48.62884443' + - 'echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_696e41bf712c49.43452379' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712c49.43452379' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWRlNDguNjI4ODQ0NDMifQ== Dockerfile_69287be809de48.62884443' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTJjNDkuNDM0NTIzNzkifQ== Dockerfile_696e41bf712c49.43452379' - 'docker push webdevops/php-apache:8.5-alpine' - 'docker tag webdevops/php-apache:8.5-alpine $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' - tags: - - aws needs: - 'webdevops/php:8.5-alpine' 'webdevops/php-dev:8.1': @@ -600,17 +548,15 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_69287be80865b8.08882691' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80865b8.08882691' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_696e41bf6f5501.55640001' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f5501.55640001' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NjViOC4wODg4MjY5MSJ9 Dockerfile_69287be80865b8.08882691' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNTUwMS41NTY0MDAwMSJ9 Dockerfile_696e41bf6f5501.55640001' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' - tags: - - aws needs: - 'webdevops/php:8.1' 'webdevops/php-dev:8.1-alpine': @@ -623,17 +569,15 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_69287be809d249.39633466' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809d249.39633466' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_696e41bf711ea0.98934750' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711ea0.98934750' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWQyNDkuMzk2MzM0NjYifQ== Dockerfile_69287be809d249.39633466' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTFlYTAuOTg5MzQ3NTAifQ== Dockerfile_696e41bf711ea0.98934750' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - tags: - - aws needs: - 'webdevops/php:8.1-alpine' 'webdevops/php-dev:8.2': @@ -646,17 +590,15 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_69287be8096a14.11893350' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8096a14.11893350' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_696e41bf708e83.46250268' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708e83.46250268' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NmExNC4xMTg5MzM1MCJ9 Dockerfile_69287be8096a14.11893350' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwOGU4My40NjI1MDI2OCJ9 Dockerfile_696e41bf708e83.46250268' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' - tags: - - aws needs: - 'webdevops/php:8.2' 'webdevops/php-dev:8.2-alpine': @@ -669,17 +611,15 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_69287be8090975.75273771' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8090975.75273771' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_696e41bf701ea1.65363229' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf701ea1.65363229' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTA5NzUuNzUyNzM3NzEifQ== Dockerfile_69287be8090975.75273771' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDFlYTEuNjUzNjMyMjkifQ== Dockerfile_696e41bf701ea1.65363229' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - tags: - - aws needs: - 'webdevops/php:8.2-alpine' 'webdevops/php-dev:8.3': @@ -692,17 +632,15 @@ stages: - 'cd docker/php-dev/8.3' - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_69287be809f618.46491550' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809f618.46491550' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_696e41bf7144c9.98354223' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7144c9.98354223' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZjYxOC40NjQ5MTU1MCJ9 Dockerfile_69287be809f618.46491550' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNDRjOS45ODM1NDIyMyJ9 Dockerfile_696e41bf7144c9.98354223' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3' - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' - tags: - - aws needs: - 'webdevops/php:8.3' 'webdevops/php-dev:8.3-alpine': @@ -715,17 +653,15 @@ stages: - 'cd docker/php-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_69287be80879b7.76968640' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80879b7.76968640' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_696e41bf6f8290.33010211' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f8290.33010211' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODc5YjcuNzY5Njg2NDAifQ== Dockerfile_69287be80879b7.76968640' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZjgyOTAuMzMwMTAyMTEifQ== Dockerfile_696e41bf6f8290.33010211' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3-alpine' - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - tags: - - aws needs: - 'webdevops/php:8.3-alpine' 'webdevops/php-dev:8.4': @@ -738,17 +674,15 @@ stages: - 'cd docker/php-dev/8.4' - 'docker build --no-cache -t webdevops/php-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_69287be809acc7.13310467' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809acc7.13310467' + - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_696e41bf70d1c4.92178512' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70d1c4.92178512' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YWNjNy4xMzMxMDQ2NyJ9 Dockerfile_69287be809acc7.13310467' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwZDFjNC45MjE3ODUxMiJ9 Dockerfile_696e41bf70d1c4.92178512' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.4' - 'docker tag webdevops/php-dev:8.4 $CI_REGISTRY_IMAGE/php-dev:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4' - tags: - - aws needs: - 'webdevops/php:8.4' 'webdevops/php-dev:8.4-alpine': @@ -761,17 +695,15 @@ stages: - 'cd docker/php-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_69287be8091917.39182480' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8091917.39182480' + - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_696e41bf7034b9.18377781' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7034b9.18377781' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTE5MTcuMzkxODI0ODAifQ== Dockerfile_69287be8091917.39182480' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDM0YjkuMTgzNzc3ODEifQ== Dockerfile_696e41bf7034b9.18377781' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.4-alpine' - 'docker tag webdevops/php-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' - tags: - - aws needs: - 'webdevops/php:8.4-alpine' 'webdevops/php-dev:8.5': @@ -784,17 +716,15 @@ stages: - 'cd docker/php-dev/8.5' - 'docker build --no-cache -t webdevops/php-dev:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.5" >> Dockerfile_69287be808e412.80583875' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808e412.80583875' + - 'echo "FROM webdevops/php-dev:8.5" >> Dockerfile_696e41bf6fec21.70258039' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fec21.70258039' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZTQxMi44MDU4Mzg3NSJ9 Dockerfile_69287be808e412.80583875' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZWMyMS43MDI1ODAzOSJ9 Dockerfile_696e41bf6fec21.70258039' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.5' - 'docker tag webdevops/php-dev:8.5 $CI_REGISTRY_IMAGE/php-dev:8.5' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5' - tags: - - aws needs: - 'webdevops/php:8.5' 'webdevops/php-dev:8.5-alpine': @@ -807,17 +737,15 @@ stages: - 'cd docker/php-dev/8.5-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_69287be809e491.90391978' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809e491.90391978' + - 'echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_696e41bf713353.08634189' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713353.08634189' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWU0OTEuOTAzOTE5NzgifQ== Dockerfile_69287be809e491.90391978' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTMzNTMuMDg2MzQxODkifQ== Dockerfile_696e41bf713353.08634189' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.5-alpine' - 'docker tag webdevops/php-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' - tags: - - aws needs: - 'webdevops/php:8.5-alpine' 'webdevops/php-nginx:8.1': @@ -830,17 +758,15 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_69287be8086ae7.34611114' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8086ae7.34611114' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_696e41bf6f62a4.85222163' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f62a4.85222163' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg2YWU3LjM0NjExMTE0In0= Dockerfile_69287be8086ae7.34611114' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY2MmE0Ljg1MjIyMTYzIn0= Dockerfile_696e41bf6f62a4.85222163' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' - tags: - - aws needs: - 'webdevops/php:8.1' 'webdevops/php-nginx:8.1-alpine': @@ -853,17 +779,15 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_69287be809d400.62365738' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809d400.62365738' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_696e41bf712274.14410517' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712274.14410517' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZDQwMC42MjM2NTczOCJ9 Dockerfile_69287be809d400.62365738' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMjI3NC4xNDQxMDUxNyJ9 Dockerfile_696e41bf712274.14410517' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - tags: - - aws needs: - 'webdevops/php:8.1-alpine' 'webdevops/php-nginx:8.2': @@ -876,17 +800,15 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_69287be8096be5.07623118' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8096be5.07623118' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_696e41bf7091b2.50487077' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7091b2.50487077' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDk2YmU1LjA3NjIzMTE4In0= Dockerfile_69287be8096be5.07623118' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzA5MWIyLjUwNDg3MDc3In0= Dockerfile_696e41bf7091b2.50487077' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' - tags: - - aws needs: - 'webdevops/php:8.2' 'webdevops/php-nginx:8.2-alpine': @@ -899,17 +821,15 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_69287be8090af2.51704423' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8090af2.51704423' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_696e41bf702546.04517749' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702546.04517749' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MGFmMi41MTcwNDQyMyJ9 Dockerfile_69287be8090af2.51704423' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMjU0Ni4wNDUxNzc0OSJ9 Dockerfile_696e41bf702546.04517749' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - tags: - - aws needs: - 'webdevops/php:8.2-alpine' 'webdevops/php-nginx:8.3': @@ -922,17 +842,15 @@ stages: - 'cd docker/php-nginx/8.3' - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_69287be809f952.98817264' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809f952.98817264' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_696e41bf714811.99513491' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714811.99513491' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDlmOTUyLjk4ODE3MjY0In0= Dockerfile_69287be809f952.98817264' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE0ODExLjk5NTEzNDkxIn0= Dockerfile_696e41bf714811.99513491' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3' - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' - tags: - - aws needs: - 'webdevops/php:8.3' 'webdevops/php-nginx:8.3-alpine': @@ -945,17 +863,15 @@ stages: - 'cd docker/php-nginx/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_69287be8087c69.73059488' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8087c69.73059488' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_696e41bf6f85f4.05297345' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f85f4.05297345' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4N2M2OS43MzA1OTQ4OCJ9 Dockerfile_69287be8087c69.73059488' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmODVmNC4wNTI5NzM0NSJ9 Dockerfile_696e41bf6f85f4.05297345' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3-alpine' - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - tags: - - aws needs: - 'webdevops/php:8.3-alpine' 'webdevops/php-nginx:8.4': @@ -968,17 +884,15 @@ stages: - 'cd docker/php-nginx/8.4' - 'docker build --no-cache -t webdevops/php-nginx:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_69287be809b0e3.29753497' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809b0e3.29753497' + - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_696e41bf70dc05.37653427' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70dc05.37653427' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDliMGUzLjI5NzUzNDk3In0= Dockerfile_69287be809b0e3.29753497' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzBkYzA1LjM3NjUzNDI3In0= Dockerfile_696e41bf70dc05.37653427' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.4' - 'docker tag webdevops/php-nginx:8.4 $CI_REGISTRY_IMAGE/php-nginx:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4' - tags: - - aws needs: - 'webdevops/php:8.4' 'webdevops/php-nginx:8.4-alpine': @@ -991,17 +905,15 @@ stages: - 'cd docker/php-nginx/8.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_69287be8091e12.87659676' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8091e12.87659676' + - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_696e41bf703766.88631265' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf703766.88631265' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5MWUxMi44NzY1OTY3NiJ9 Dockerfile_69287be8091e12.87659676' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMzc2Ni44ODYzMTI2NSJ9 Dockerfile_696e41bf703766.88631265' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.4-alpine' - 'docker tag webdevops/php-nginx:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' - tags: - - aws needs: - 'webdevops/php:8.4-alpine' 'webdevops/php-nginx:8.5': @@ -1014,17 +926,15 @@ stages: - 'cd docker/php-nginx/8.5' - 'docker build --no-cache -t webdevops/php-nginx:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_69287be808e5c3.13098686' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808e5c3.13098686' + - 'echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_696e41bf6fef00.47980376' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fef00.47980376' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDhlNWMzLjEzMDk4Njg2In0= Dockerfile_69287be808e5c3.13098686' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmZlZjAwLjQ3OTgwMzc2In0= Dockerfile_696e41bf6fef00.47980376' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.5' - 'docker tag webdevops/php-nginx:8.5 $CI_REGISTRY_IMAGE/php-nginx:8.5' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5' - tags: - - aws needs: - 'webdevops/php:8.5' 'webdevops/php-nginx:8.5-alpine': @@ -1037,17 +947,15 @@ stages: - 'cd docker/php-nginx/8.5-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_69287be809e644.29403101' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809e644.29403101' + - 'echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_696e41bf7135a2.65923845' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7135a2.65923845' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZTY0NC4yOTQwMzEwMSJ9 Dockerfile_69287be809e644.29403101' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMzVhMi42NTkyMzg0NSJ9 Dockerfile_696e41bf7135a2.65923845' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.5-alpine' - 'docker tag webdevops/php-nginx:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' - tags: - - aws needs: - 'webdevops/php:8.5-alpine' 'webdevops/apache:alpine': @@ -1060,15 +968,13 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_69287be80a1720.16252575' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1720.16252575' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_696e41bf7162b9.73549954' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7162b9.73549954' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MGExNzIwLjE2MjUyNTc1In0= Dockerfile_69287be80a1720.16252575' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE2MmI5LjczNTQ5OTU0In0= Dockerfile_696e41bf7162b9.73549954' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' - tags: - - aws needs: - 'webdevops/base:alpine' 'webdevops/base-app:alpine': @@ -1081,17 +987,15 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_69287be80a1cc7.66504182' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1cc7.66504182' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_696e41bf7169e4.26706147' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7169e4.26706147' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTFjYzcuNjY1MDQxODIifQ== Dockerfile_69287be80a1cc7.66504182' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTY5ZTQuMjY3MDYxNDcifQ== Dockerfile_696e41bf7169e4.26706147' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' - tags: - - aws needs: - 'webdevops/base:alpine' 'webdevops/base-app:ubuntu-22.04': @@ -1104,10 +1008,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_69287be80a28a2.22679327' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a28a2.22679327' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_696e41bf717aa5.90037060' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717aa5.90037060' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMjhhMi4yMjY3OTMyNyJ9 Dockerfile_69287be80a28a2.22679327' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxN2FhNS45MDAzNzA2MCJ9 Dockerfile_696e41bf717aa5.90037060' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -1115,8 +1019,6 @@ stages: - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' - 'docker push webdevops/base-app:latest' - tags: - - aws needs: - 'webdevops/base:ubuntu-22.04' 'webdevops/nginx:alpine': @@ -1129,15 +1031,13 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_69287be80a1959.99222454' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a1959.99222454' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_696e41bf716588.37759391' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf716588.37759391' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwYTE5NTkuOTkyMjI0NTQifQ== Dockerfile_69287be80a1959.99222454' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTY1ODguMzc3NTkzOTEifQ== Dockerfile_696e41bf716588.37759391' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' - tags: - - aws needs: - 'webdevops/base:alpine' 'webdevops/php-apache-dev:8.1': @@ -1150,15 +1050,13 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_69287be80862d4.18963874' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80862d4.18963874' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_696e41bf6f5241.22348086' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f5241.22348086' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODYyZDQuMTg5NjM4NzQifQ== Dockerfile_69287be80862d4.18963874' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZjUyNDEuMjIzNDgwODYifQ== Dockerfile_696e41bf6f5241.22348086' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - tags: - - aws needs: - 'webdevops/php-apache:8.1' 'webdevops/php-apache-dev:8.1-alpine': @@ -1171,15 +1069,13 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_69287be809cf75.27452479' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809cf75.27452479' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_696e41bf711870.34792511' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711870.34792511' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDljZjc1LjI3NDUyNDc5In0= Dockerfile_69287be809cf75.27452479' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzExODcwLjM0NzkyNTExIn0= Dockerfile_696e41bf711870.34792511' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - tags: - - aws needs: - 'webdevops/php-apache:8.1-alpine' 'webdevops/php-apache-dev:8.2': @@ -1192,15 +1088,13 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_69287be8096655.26048753' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8096655.26048753' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_696e41bf708a12.21004060' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708a12.21004060' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTY2NTUuMjYwNDg3NTMifQ== Dockerfile_69287be8096655.26048753' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDhhMTIuMjEwMDQwNjAifQ== Dockerfile_696e41bf708a12.21004060' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - tags: - - aws needs: - 'webdevops/php-apache:8.2' 'webdevops/php-apache-dev:8.2-alpine': @@ -1213,15 +1107,13 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_69287be8090744.60854462' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8090744.60854462' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_696e41bf701c98.00849673' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf701c98.00849673' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDkwNzQ0LjYwODU0NDYyIn0= Dockerfile_69287be8090744.60854462' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzAxYzk4LjAwODQ5NjczIn0= Dockerfile_696e41bf701c98.00849673' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - tags: - - aws needs: - 'webdevops/php-apache:8.2-alpine' 'webdevops/php-apache-dev:8.3': @@ -1234,15 +1126,13 @@ stages: - 'cd docker/php-apache-dev/8.3' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_69287be809f289.20754057' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809f289.20754057' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_696e41bf714124.57080261' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714124.57080261' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWYyODkuMjA3NTQwNTcifQ== Dockerfile_69287be809f289.20754057' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTQxMjQuNTcwODAyNjEifQ== Dockerfile_696e41bf714124.57080261' - 'docker push webdevops/php-apache-dev:8.3' - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - tags: - - aws needs: - 'webdevops/php-apache:8.3' 'webdevops/php-apache-dev:8.3-alpine': @@ -1255,15 +1145,13 @@ stages: - 'cd docker/php-apache-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_69287be80875e2.53911766' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80875e2.53911766' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_696e41bf6f7c50.10145806' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7c50.10145806' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDg3NWUyLjUzOTExNzY2In0= Dockerfile_69287be80875e2.53911766' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY3YzUwLjEwMTQ1ODA2In0= Dockerfile_696e41bf6f7c50.10145806' - 'docker push webdevops/php-apache-dev:8.3-alpine' - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - tags: - - aws needs: - 'webdevops/php-apache:8.3-alpine' 'webdevops/php-apache-dev:8.4': @@ -1276,15 +1164,13 @@ stages: - 'cd docker/php-apache-dev/8.4' - 'docker build --no-cache -t webdevops/php-apache-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_69287be809aa20.63977001' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809aa20.63977001' + - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_696e41bf70cb73.19332399' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70cb73.19332399' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWFhMjAuNjM5NzcwMDEifQ== Dockerfile_69287be809aa20.63977001' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MGNiNzMuMTkzMzIzOTkifQ== Dockerfile_696e41bf70cb73.19332399' - 'docker push webdevops/php-apache-dev:8.4' - 'docker tag webdevops/php-apache-dev:8.4 $CI_REGISTRY_IMAGE/php-apache-dev:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4' - tags: - - aws needs: - 'webdevops/php-apache:8.4' 'webdevops/php-apache-dev:8.4-alpine': @@ -1297,15 +1183,13 @@ stages: - 'cd docker/php-apache-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_69287be80915b3.42372894' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80915b3.42372894' + - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_696e41bf702ec0.44102326' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702ec0.44102326' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDkxNWIzLjQyMzcyODk0In0= Dockerfile_69287be80915b3.42372894' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzAyZWMwLjQ0MTAyMzI2In0= Dockerfile_696e41bf702ec0.44102326' - 'docker push webdevops/php-apache-dev:8.4-alpine' - 'docker tag webdevops/php-apache-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' - tags: - - aws needs: - 'webdevops/php-apache:8.4-alpine' 'webdevops/php-apache-dev:8.5': @@ -1318,15 +1202,13 @@ stages: - 'cd docker/php-apache-dev/8.5' - 'docker build --no-cache -t webdevops/php-apache-dev:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_69287be808e0f1.57438701' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808e0f1.57438701' + - 'echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_696e41bf6feb22.73737623' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6feb22.73737623' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOGUwZjEuNTc0Mzg3MDEifQ== Dockerfile_69287be808e0f1.57438701' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZmViMjIuNzM3Mzc2MjMifQ== Dockerfile_696e41bf6feb22.73737623' - 'docker push webdevops/php-apache-dev:8.5' - 'docker tag webdevops/php-apache-dev:8.5 $CI_REGISTRY_IMAGE/php-apache-dev:8.5' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5' - tags: - - aws needs: - 'webdevops/php-apache:8.5' 'webdevops/php-apache-dev:8.5-alpine': @@ -1339,15 +1221,13 @@ stages: - 'cd docker/php-apache-dev/8.5-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_69287be809e134.71960535' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809e134.71960535' + - 'echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_696e41bf712f32.75923310' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712f32.75923310' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5Mjg3YmU4MDllMTM0LjcxOTYwNTM1In0= Dockerfile_69287be809e134.71960535' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzEyZjMyLjc1OTIzMzEwIn0= Dockerfile_696e41bf712f32.75923310' - 'docker push webdevops/php-apache-dev:8.5-alpine' - 'docker tag webdevops/php-apache-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' - tags: - - aws needs: - 'webdevops/php-apache:8.5-alpine' 'webdevops/php-nginx-dev:8.1': @@ -1360,15 +1240,13 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_69287be8086e05.96143394' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8086e05.96143394' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_696e41bf6f6be8.20061357' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f6be8.20061357' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4NmUwNS45NjE0MzM5NCJ9 Dockerfile_69287be8086e05.96143394' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNmJlOC4yMDA2MTM1NyJ9 Dockerfile_696e41bf6f6be8.20061357' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - tags: - - aws needs: - 'webdevops/php-nginx:8.1' 'webdevops/php-nginx-dev:8.1-alpine': @@ -1381,15 +1259,13 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_69287be809d6d0.26709604' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809d6d0.26709604' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_696e41bf712602.77473730' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712602.77473730' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWQ2ZDAuMjY3MDk2MDQifQ== Dockerfile_69287be809d6d0.26709604' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTI2MDIuNzc0NzM3MzAifQ== Dockerfile_696e41bf712602.77473730' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - tags: - - aws needs: - 'webdevops/php-nginx:8.1-alpine' 'webdevops/php-nginx-dev:8.2': @@ -1402,15 +1278,13 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_69287be8096f14.33205603' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8096f14.33205603' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_696e41bf709352.38990294' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf709352.38990294' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5NmYxNC4zMzIwNTYwMyJ9 Dockerfile_69287be8096f14.33205603' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwOTM1Mi4zODk5MDI5NCJ9 Dockerfile_696e41bf709352.38990294' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - tags: - - aws needs: - 'webdevops/php-nginx:8.2' 'webdevops/php-nginx-dev:8.2-alpine': @@ -1423,15 +1297,13 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_69287be8090e95.27561622' - - 'echo "COPY conf/ /" >> Dockerfile_69287be8090e95.27561622' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_696e41bf7028d7.64655733' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7028d7.64655733' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTBlOTUuMjc1NjE2MjIifQ== Dockerfile_69287be8090e95.27561622' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDI4ZDcuNjQ2NTU3MzMifQ== Dockerfile_696e41bf7028d7.64655733' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - tags: - - aws needs: - 'webdevops/php-nginx:8.2-alpine' 'webdevops/php-nginx-dev:8.3': @@ -1444,15 +1316,13 @@ stages: - 'cd docker/php-nginx-dev/8.3' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_69287be809fb00.04489363' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809fb00.04489363' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_696e41bf714c38.47956006' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714c38.47956006' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5ZmIwMC4wNDQ4OTM2MyJ9 Dockerfile_69287be809fb00.04489363' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNGMzOC40Nzk1NjAwNiJ9 Dockerfile_696e41bf714c38.47956006' - 'docker push webdevops/php-nginx-dev:8.3' - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - tags: - - aws needs: - 'webdevops/php-nginx:8.3' 'webdevops/php-nginx-dev:8.3-alpine': @@ -1465,15 +1335,13 @@ stages: - 'cd docker/php-nginx-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_69287be80884b6.29968463' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80884b6.29968463' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_696e41bf6f89d4.11952215' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f89d4.11952215' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwODg0YjYuMjk5Njg0NjMifQ== Dockerfile_69287be80884b6.29968463' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2Zjg5ZDQuMTE5NTIyMTUifQ== Dockerfile_696e41bf6f89d4.11952215' - 'docker push webdevops/php-nginx-dev:8.3-alpine' - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - tags: - - aws needs: - 'webdevops/php-nginx:8.3-alpine' 'webdevops/php-nginx-dev:8.4': @@ -1486,15 +1354,13 @@ stages: - 'cd docker/php-nginx-dev/8.4' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_69287be809b396.90126433' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809b396.90126433' + - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_696e41bf70e354.37905290' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70e354.37905290' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA5YjM5Ni45MDEyNjQzMyJ9 Dockerfile_69287be809b396.90126433' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwZTM1NC4zNzkwNTI5MCJ9 Dockerfile_696e41bf70e354.37905290' - 'docker push webdevops/php-nginx-dev:8.4' - 'docker tag webdevops/php-nginx-dev:8.4 $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' - tags: - - aws needs: - 'webdevops/php-nginx:8.4' 'webdevops/php-nginx-dev:8.4-alpine': @@ -1507,15 +1373,13 @@ stages: - 'cd docker/php-nginx-dev/8.4-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_69287be80920f5.83000443' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80920f5.83000443' + - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_696e41bf703c32.25000483' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf703c32.25000483' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOTIwZjUuODMwMDA0NDMifQ== Dockerfile_69287be80920f5.83000443' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDNjMzIuMjUwMDA0ODMifQ== Dockerfile_696e41bf703c32.25000483' - 'docker push webdevops/php-nginx-dev:8.4-alpine' - 'docker tag webdevops/php-nginx-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' - tags: - - aws needs: - 'webdevops/php-nginx:8.4-alpine' 'webdevops/php-nginx-dev:8.5': @@ -1528,15 +1392,13 @@ stages: - 'cd docker/php-nginx-dev/8.5' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_69287be808e722.96804194' - - 'echo "COPY conf/ /" >> Dockerfile_69287be808e722.96804194' + - 'echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_696e41bf6ff591.40436400' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6ff591.40436400' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODA4ZTcyMi45NjgwNDE5NCJ9 Dockerfile_69287be808e722.96804194' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZjU5MS40MDQzNjQwMCJ9 Dockerfile_696e41bf6ff591.40436400' - 'docker push webdevops/php-nginx-dev:8.5' - 'docker tag webdevops/php-nginx-dev:8.5 $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' - tags: - - aws needs: - 'webdevops/php-nginx:8.5' 'webdevops/php-nginx-dev:8.5-alpine': @@ -1549,15 +1411,13 @@ stages: - 'cd docker/php-nginx-dev/8.5-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_69287be809e8c8.17761246' - - 'echo "COPY conf/ /" >> Dockerfile_69287be809e8c8.17761246' + - 'echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_696e41bf7138e8.37665030' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7138e8.37665030' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjkyODdiZTgwOWU4YzguMTc3NjEyNDYifQ== Dockerfile_69287be809e8c8.17761246' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTM4ZTguMzc2NjUwMzAifQ== Dockerfile_696e41bf7138e8.37665030' - 'docker push webdevops/php-nginx-dev:8.5-alpine' - 'docker tag webdevops/php-nginx-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' - tags: - - aws needs: - 'webdevops/php-nginx:8.5-alpine' 'webdevops/vsftp:latest': @@ -1570,15 +1430,13 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_69287be80a2556.99736505' - - 'echo "COPY conf/ /" >> Dockerfile_69287be80a2556.99736505' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_696e41bf717783.29372385' + - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717783.29372385' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTI4N2JlODBhMjU1Ni45OTczNjUwNSJ9 Dockerfile_69287be80a2556.99736505' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNzc4My4yOTM3MjM4NSJ9 Dockerfile_696e41bf717783.29372385' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' - tags: - - aws needs: - 'webdevops/base:ubuntu-22.04' 'webdevops/dockerfile-build-env:latest': @@ -1593,7 +1451,5 @@ stages: - 'docker push webdevops/dockerfile-build-env:latest' - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - tags: - - aws needs: - 'webdevops/base-app:ubuntu-22.04' diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php index 13faccd0c..773e620ed 100644 --- a/ci/src/JobBuilder.php +++ b/ci/src/JobBuilder.php @@ -23,7 +23,7 @@ private function getBasicJobDefinition(array $node) 'image' => 'webdevops/dockerfile-build-env', 'script' => [], // 'retry' => 2, - 'tags' => ['aws'], +// 'tags' => ['aws'], // 'only' => ['master'], ]; if ($node['parent'] !== 0) { From 9ef35381b5f6fd185bede509d78e668ce10e1efb Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 19 Jan 2026 17:00:19 +0100 Subject: [PATCH 55/63] =?UTF-8?q?=E2=9C=A8=20add=20github=20workflow=20bui?= =?UTF-8?q?ld=20+=20=E2=9E=95=20add=20amqp=20to=20PHP=208.5=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- .github/workflows/build.yaml | 3981 +++++++++++++++++ .gitlab-ci.yml | 1455 ------ README.md | 14 +- ci/console | 4 +- .../{GitlabCommand.php => GithubCommand.php} | 53 +- ci/src/GithubJobBuilder.php | 132 + ci/src/JobBuilder.php | 99 - docker/php-official/8.5-alpine/Dockerfile | 1 + docker/php-official/8.5/Dockerfile | 1 + old.gitlab-ci.yml | 1063 ----- template/Dockerfile/images/php.jinja2 | 4 +- 12 files changed, 4156 insertions(+), 2653 deletions(-) create mode 100644 .github/workflows/build.yaml delete mode 100644 .gitlab-ci.yml rename ci/src/Commands/{GitlabCommand.php => GithubCommand.php} (62%) create mode 100644 ci/src/GithubJobBuilder.php delete mode 100644 ci/src/JobBuilder.php delete mode 100644 old.gitlab-ci.yml diff --git a/.editorconfig b/.editorconfig index 4186d9cc9..4ca38ef6a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,7 +17,7 @@ insert_final_newline = false [Makefile] indent_style = tab -[*.yml] +[{*.yml,*.yaml}] indent_size = 2 [*.conf] diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 000000000..a88f28dda --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,3981 @@ +name: build +'on': + schedule: + - + cron: '0 0 * * 2' + push: null + pull_request: + branches: + - master + workflow_dispatch: null +jobs: + apache_alpine: + name: 'webdevops/apache:alpine' + needs: + - base_alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/apache/alpine + load: true + tags: 'ghcr.io/webdevops/apache:alpine,webdevops/apache:alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/apache:alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/apache/alpine + push: true + tags: 'ghcr.io/webdevops/apache:alpine,webdevops/apache:alpine' + platforms: linux/amd64 + base-app_alpine: + name: 'webdevops/base-app:alpine' + needs: + - base_alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/base-app/alpine + load: true + tags: 'ghcr.io/webdevops/base-app:alpine,webdevops/base-app:alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/base-app:alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/base-app/alpine + push: true + tags: 'ghcr.io/webdevops/base-app:alpine,webdevops/base-app:alpine' + platforms: linux/amd64 + base-app_ubuntu-22-04: + name: 'webdevops/base-app:ubuntu-22.04' + needs: + - base_ubuntu-22-04 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/base-app/ubuntu-22.04 + load: true + tags: 'ghcr.io/webdevops/base-app:ubuntu-22.04,webdevops/base-app:ubuntu-22.04' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/base-app/ubuntu-22.04 + push: true + tags: 'ghcr.io/webdevops/base-app:ubuntu-22.04,webdevops/base-app:ubuntu-22.04' + platforms: linux/amd64 + base_alpine: + name: 'webdevops/base:alpine' + needs: + - bootstrap_alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/base/alpine + load: true + tags: 'ghcr.io/webdevops/base:alpine,webdevops/base:alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/base:alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/base/alpine + push: true + tags: 'ghcr.io/webdevops/base:alpine,webdevops/base:alpine' + platforms: linux/amd64 + base_ubuntu-22-04: + name: 'webdevops/base:ubuntu-22.04' + needs: + - bootstrap_ubuntu-22-04 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/base/ubuntu-22.04 + load: true + tags: 'ghcr.io/webdevops/base:ubuntu-22.04,webdevops/base:ubuntu-22.04' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/base/ubuntu-22.04 + push: true + tags: 'ghcr.io/webdevops/base:ubuntu-22.04,webdevops/base:ubuntu-22.04' + platforms: linux/amd64 + bootstrap_alpine: + name: 'webdevops/bootstrap:alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/bootstrap/alpine + load: true + tags: 'ghcr.io/webdevops/bootstrap:alpine,webdevops/bootstrap:alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/bootstrap/alpine + push: true + tags: 'ghcr.io/webdevops/bootstrap:alpine,webdevops/bootstrap:alpine' + platforms: linux/amd64 + bootstrap_ubuntu-22-04: + name: 'webdevops/bootstrap:ubuntu-22.04' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/bootstrap/ubuntu-22.04 + load: true + tags: 'ghcr.io/webdevops/bootstrap:ubuntu-22.04,webdevops/bootstrap:ubuntu-22.04' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/bootstrap/ubuntu-22.04 + push: true + tags: 'ghcr.io/webdevops/bootstrap:ubuntu-22.04,webdevops/bootstrap:ubuntu-22.04' + platforms: linux/amd64 + dockerfile-build-env_latest: + name: 'webdevops/dockerfile-build-env:latest' + needs: + - base-app_ubuntu-22-04 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/dockerfile-build-env/latest + load: true + tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' + platforms: linux/amd64 + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/dockerfile-build-env/latest + push: true + tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' + platforms: linux/amd64 + nginx_alpine: + name: 'webdevops/nginx:alpine' + needs: + - base_alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/nginx/alpine + load: true + tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/nginx:alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/nginx/alpine + push: true + tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' + platforms: linux/amd64 + php-apache-dev_8-1: + name: 'webdevops/php-apache-dev:8.1' + needs: + - php-apache_8-1 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.1 + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.1,webdevops/php-apache-dev:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.1 + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.1,webdevops/php-apache-dev:8.1' + platforms: linux/amd64 + php-apache-dev_8-1-alpine: + name: 'webdevops/php-apache-dev:8.1-alpine' + needs: + - php-apache_8-1-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.1-alpine,webdevops/php-apache-dev:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.1-alpine,webdevops/php-apache-dev:8.1-alpine' + platforms: linux/amd64 + php-apache-dev_8-2: + name: 'webdevops/php-apache-dev:8.2' + needs: + - php-apache_8-2 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.2 + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.2,webdevops/php-apache-dev:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.2 + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.2,webdevops/php-apache-dev:8.2' + platforms: linux/amd64 + php-apache-dev_8-2-alpine: + name: 'webdevops/php-apache-dev:8.2-alpine' + needs: + - php-apache_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.2-alpine,webdevops/php-apache-dev:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.2-alpine,webdevops/php-apache-dev:8.2-alpine' + platforms: linux/amd64 + php-apache-dev_8-3: + name: 'webdevops/php-apache-dev:8.3' + needs: + - php-apache_8-3 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.3 + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.3,webdevops/php-apache-dev:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.3 + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.3,webdevops/php-apache-dev:8.3' + platforms: linux/amd64 + php-apache-dev_8-3-alpine: + name: 'webdevops/php-apache-dev:8.3-alpine' + needs: + - php-apache_8-3-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.3-alpine,webdevops/php-apache-dev:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.3-alpine,webdevops/php-apache-dev:8.3-alpine' + platforms: linux/amd64 + php-apache-dev_8-4: + name: 'webdevops/php-apache-dev:8.4' + needs: + - php-apache_8-4 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.4 + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.4,webdevops/php-apache-dev:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.4 + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.4,webdevops/php-apache-dev:8.4' + platforms: linux/amd64 + php-apache-dev_8-4-alpine: + name: 'webdevops/php-apache-dev:8.4-alpine' + needs: + - php-apache_8-4-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.4-alpine,webdevops/php-apache-dev:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.4-alpine,webdevops/php-apache-dev:8.4-alpine' + platforms: linux/amd64 + php-apache-dev_8-5: + name: 'webdevops/php-apache-dev:8.5' + needs: + - php-apache_8-5 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.5 + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.5,webdevops/php-apache-dev:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.5 + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.5,webdevops/php-apache-dev:8.5' + platforms: linux/amd64 + php-apache-dev_8-5-alpine: + name: 'webdevops/php-apache-dev:8.5-alpine' + needs: + - php-apache_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.5-alpine,webdevops/php-apache-dev:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache-dev/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache-dev:8.5-alpine,webdevops/php-apache-dev:8.5-alpine' + platforms: linux/amd64 + php-apache_8-1: + name: 'webdevops/php-apache:8.1' + needs: + - php_8-1 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.1 + load: true + tags: 'ghcr.io/webdevops/php-apache:8.1,webdevops/php-apache:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.1 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.1,webdevops/php-apache:8.1' + platforms: linux/amd64 + php-apache_8-1-alpine: + name: 'webdevops/php-apache:8.1-alpine' + needs: + - php_8-1-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache:8.1-alpine,webdevops/php-apache:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache:8.1-alpine,webdevops/php-apache:8.1-alpine' + platforms: linux/amd64 + php-apache_8-2: + name: 'webdevops/php-apache:8.2' + needs: + - php_8-2 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.2 + load: true + tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.2 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' + platforms: linux/amd64 + php-apache_8-2-alpine: + name: 'webdevops/php-apache:8.2-alpine' + needs: + - php_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache:8.2-alpine,webdevops/php-apache:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache:8.2-alpine,webdevops/php-apache:8.2-alpine' + platforms: linux/amd64 + php-apache_8-3: + name: 'webdevops/php-apache:8.3' + needs: + - php_8-3 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.3 + load: true + tags: 'ghcr.io/webdevops/php-apache:8.3,webdevops/php-apache:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.3 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.3,webdevops/php-apache:8.3' + platforms: linux/amd64 + php-apache_8-3-alpine: + name: 'webdevops/php-apache:8.3-alpine' + needs: + - php_8-3-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache:8.3-alpine,webdevops/php-apache:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache:8.3-alpine,webdevops/php-apache:8.3-alpine' + platforms: linux/amd64 + php-apache_8-4: + name: 'webdevops/php-apache:8.4' + needs: + - php_8-4 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.4 + load: true + tags: 'ghcr.io/webdevops/php-apache:8.4,webdevops/php-apache:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.4 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.4,webdevops/php-apache:8.4' + platforms: linux/amd64 + php-apache_8-4-alpine: + name: 'webdevops/php-apache:8.4-alpine' + needs: + - php_8-4-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache:8.4-alpine,webdevops/php-apache:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache:8.4-alpine,webdevops/php-apache:8.4-alpine' + platforms: linux/amd64 + php-apache_8-5: + name: 'webdevops/php-apache:8.5' + needs: + - php_8-5 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.5 + load: true + tags: 'ghcr.io/webdevops/php-apache:8.5,webdevops/php-apache:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.5 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.5,webdevops/php-apache:8.5' + platforms: linux/amd64 + php-apache_8-5-alpine: + name: 'webdevops/php-apache:8.5-alpine' + needs: + - php_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php-apache:8.5-alpine,webdevops/php-apache:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php-apache:8.5-alpine,webdevops/php-apache:8.5-alpine' + platforms: linux/amd64 + php-dev_8-1: + name: 'webdevops/php-dev:8.1' + needs: + - php_8-1 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.1 + load: true + tags: 'ghcr.io/webdevops/php-dev:8.1,webdevops/php-dev:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.1 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.1,webdevops/php-dev:8.1' + platforms: linux/amd64 + php-dev_8-1-alpine: + name: 'webdevops/php-dev:8.1-alpine' + needs: + - php_8-1-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php-dev:8.1-alpine,webdevops/php-dev:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php-dev:8.1-alpine,webdevops/php-dev:8.1-alpine' + platforms: linux/amd64 + php-dev_8-2: + name: 'webdevops/php-dev:8.2' + needs: + - php_8-2 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.2 + load: true + tags: 'ghcr.io/webdevops/php-dev:8.2,webdevops/php-dev:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.2 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.2,webdevops/php-dev:8.2' + platforms: linux/amd64 + php-dev_8-2-alpine: + name: 'webdevops/php-dev:8.2-alpine' + needs: + - php_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php-dev:8.2-alpine,webdevops/php-dev:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php-dev:8.2-alpine,webdevops/php-dev:8.2-alpine' + platforms: linux/amd64 + php-dev_8-3: + name: 'webdevops/php-dev:8.3' + needs: + - php_8-3 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.3 + load: true + tags: 'ghcr.io/webdevops/php-dev:8.3,webdevops/php-dev:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.3 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.3,webdevops/php-dev:8.3' + platforms: linux/amd64 + php-dev_8-3-alpine: + name: 'webdevops/php-dev:8.3-alpine' + needs: + - php_8-3-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php-dev:8.3-alpine,webdevops/php-dev:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php-dev:8.3-alpine,webdevops/php-dev:8.3-alpine' + platforms: linux/amd64 + php-dev_8-4: + name: 'webdevops/php-dev:8.4' + needs: + - php_8-4 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.4 + load: true + tags: 'ghcr.io/webdevops/php-dev:8.4,webdevops/php-dev:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.4 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.4,webdevops/php-dev:8.4' + platforms: linux/amd64 + php-dev_8-4-alpine: + name: 'webdevops/php-dev:8.4-alpine' + needs: + - php_8-4-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php-dev:8.4-alpine,webdevops/php-dev:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php-dev:8.4-alpine,webdevops/php-dev:8.4-alpine' + platforms: linux/amd64 + php-dev_8-5: + name: 'webdevops/php-dev:8.5' + needs: + - php_8-5 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.5 + load: true + tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.5 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' + platforms: linux/amd64 + php-dev_8-5-alpine: + name: 'webdevops/php-dev:8.5-alpine' + needs: + - php_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php-dev:8.5-alpine,webdevops/php-dev:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php-dev:8.5-alpine,webdevops/php-dev:8.5-alpine' + platforms: linux/amd64 + php-nginx-dev_8-1: + name: 'webdevops/php-nginx-dev:8.1' + needs: + - php-nginx_8-1 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.1 + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.1,webdevops/php-nginx-dev:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.1 + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.1,webdevops/php-nginx-dev:8.1' + platforms: linux/amd64 + php-nginx-dev_8-1-alpine: + name: 'webdevops/php-nginx-dev:8.1-alpine' + needs: + - php-nginx_8-1-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.1-alpine,webdevops/php-nginx-dev:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.1-alpine,webdevops/php-nginx-dev:8.1-alpine' + platforms: linux/amd64 + php-nginx-dev_8-2: + name: 'webdevops/php-nginx-dev:8.2' + needs: + - php-nginx_8-2 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.2 + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.2,webdevops/php-nginx-dev:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.2 + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.2,webdevops/php-nginx-dev:8.2' + platforms: linux/amd64 + php-nginx-dev_8-2-alpine: + name: 'webdevops/php-nginx-dev:8.2-alpine' + needs: + - php-nginx_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.2-alpine,webdevops/php-nginx-dev:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.2-alpine,webdevops/php-nginx-dev:8.2-alpine' + platforms: linux/amd64 + php-nginx-dev_8-3: + name: 'webdevops/php-nginx-dev:8.3' + needs: + - php-nginx_8-3 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.3 + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.3,webdevops/php-nginx-dev:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.3 + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.3,webdevops/php-nginx-dev:8.3' + platforms: linux/amd64 + php-nginx-dev_8-3-alpine: + name: 'webdevops/php-nginx-dev:8.3-alpine' + needs: + - php-nginx_8-3-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.3-alpine,webdevops/php-nginx-dev:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.3-alpine,webdevops/php-nginx-dev:8.3-alpine' + platforms: linux/amd64 + php-nginx-dev_8-4: + name: 'webdevops/php-nginx-dev:8.4' + needs: + - php-nginx_8-4 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.4 + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.4,webdevops/php-nginx-dev:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.4 + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.4,webdevops/php-nginx-dev:8.4' + platforms: linux/amd64 + php-nginx-dev_8-4-alpine: + name: 'webdevops/php-nginx-dev:8.4-alpine' + needs: + - php-nginx_8-4-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.4-alpine,webdevops/php-nginx-dev:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.4-alpine,webdevops/php-nginx-dev:8.4-alpine' + platforms: linux/amd64 + php-nginx-dev_8-5: + name: 'webdevops/php-nginx-dev:8.5' + needs: + - php-nginx_8-5 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.5 + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.5,webdevops/php-nginx-dev:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.5 + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.5,webdevops/php-nginx-dev:8.5' + platforms: linux/amd64 + php-nginx-dev_8-5-alpine: + name: 'webdevops/php-nginx-dev:8.5-alpine' + needs: + - php-nginx_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.5-alpine,webdevops/php-nginx-dev:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx-dev/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx-dev:8.5-alpine,webdevops/php-nginx-dev:8.5-alpine' + platforms: linux/amd64 + php-nginx_8-1: + name: 'webdevops/php-nginx:8.1' + needs: + - php_8-1 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.1 + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.1,webdevops/php-nginx:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.1 + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.1,webdevops/php-nginx:8.1' + platforms: linux/amd64 + php-nginx_8-1-alpine: + name: 'webdevops/php-nginx:8.1-alpine' + needs: + - php_8-1-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.1-alpine,webdevops/php-nginx:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.1-alpine,webdevops/php-nginx:8.1-alpine' + platforms: linux/amd64 + php-nginx_8-2: + name: 'webdevops/php-nginx:8.2' + needs: + - php_8-2 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.2 + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.2,webdevops/php-nginx:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.2 + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.2,webdevops/php-nginx:8.2' + platforms: linux/amd64 + php-nginx_8-2-alpine: + name: 'webdevops/php-nginx:8.2-alpine' + needs: + - php_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.2-alpine,webdevops/php-nginx:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.2-alpine,webdevops/php-nginx:8.2-alpine' + platforms: linux/amd64 + php-nginx_8-3: + name: 'webdevops/php-nginx:8.3' + needs: + - php_8-3 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.3 + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.3,webdevops/php-nginx:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.3 + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.3,webdevops/php-nginx:8.3' + platforms: linux/amd64 + php-nginx_8-3-alpine: + name: 'webdevops/php-nginx:8.3-alpine' + needs: + - php_8-3-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.3-alpine,webdevops/php-nginx:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.3-alpine,webdevops/php-nginx:8.3-alpine' + platforms: linux/amd64 + php-nginx_8-4: + name: 'webdevops/php-nginx:8.4' + needs: + - php_8-4 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.4 + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.4,webdevops/php-nginx:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.4 + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.4,webdevops/php-nginx:8.4' + platforms: linux/amd64 + php-nginx_8-4-alpine: + name: 'webdevops/php-nginx:8.4-alpine' + needs: + - php_8-4-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.4-alpine,webdevops/php-nginx:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.4-alpine,webdevops/php-nginx:8.4-alpine' + platforms: linux/amd64 + php-nginx_8-5: + name: 'webdevops/php-nginx:8.5' + needs: + - php_8-5 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.5 + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.5,webdevops/php-nginx:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.5 + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.5,webdevops/php-nginx:8.5' + platforms: linux/amd64 + php-nginx_8-5-alpine: + name: 'webdevops/php-nginx:8.5-alpine' + needs: + - php_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php-nginx:8.5-alpine,webdevops/php-nginx:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-nginx/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php-nginx:8.5-alpine,webdevops/php-nginx:8.5-alpine' + platforms: linux/amd64 + php_8-1: + name: 'webdevops/php:8.1' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.1 + load: true + tags: 'ghcr.io/webdevops/php:8.1,webdevops/php:8.1' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.1" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.1 + push: true + tags: 'ghcr.io/webdevops/php:8.1,webdevops/php:8.1' + platforms: linux/amd64 + php_8-1-alpine: + name: 'webdevops/php:8.1-alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.1-alpine + load: true + tags: 'ghcr.io/webdevops/php:8.1-alpine,webdevops/php:8.1-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.1-alpine + push: true + tags: 'ghcr.io/webdevops/php:8.1-alpine,webdevops/php:8.1-alpine' + platforms: linux/amd64 + php_8-2: + name: 'webdevops/php:8.2' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.2 + load: true + tags: 'ghcr.io/webdevops/php:8.2,webdevops/php:8.2' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.2" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.2 + push: true + tags: 'ghcr.io/webdevops/php:8.2,webdevops/php:8.2' + platforms: linux/amd64 + php_8-2-alpine: + name: 'webdevops/php:8.2-alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.2-alpine + load: true + tags: 'ghcr.io/webdevops/php:8.2-alpine,webdevops/php:8.2-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.2-alpine + push: true + tags: 'ghcr.io/webdevops/php:8.2-alpine,webdevops/php:8.2-alpine' + platforms: linux/amd64 + php_8-3: + name: 'webdevops/php:8.3' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.3 + load: true + tags: 'ghcr.io/webdevops/php:8.3,webdevops/php:8.3' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.3" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.3 + push: true + tags: 'ghcr.io/webdevops/php:8.3,webdevops/php:8.3' + platforms: linux/amd64 + php_8-3-alpine: + name: 'webdevops/php:8.3-alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.3-alpine + load: true + tags: 'ghcr.io/webdevops/php:8.3-alpine,webdevops/php:8.3-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.3-alpine + push: true + tags: 'ghcr.io/webdevops/php:8.3-alpine,webdevops/php:8.3-alpine' + platforms: linux/amd64 + php_8-4: + name: 'webdevops/php:8.4' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.4 + load: true + tags: 'ghcr.io/webdevops/php:8.4,webdevops/php:8.4' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.4" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.4 + push: true + tags: 'ghcr.io/webdevops/php:8.4,webdevops/php:8.4' + platforms: linux/amd64 + php_8-4-alpine: + name: 'webdevops/php:8.4-alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.4-alpine + load: true + tags: 'ghcr.io/webdevops/php:8.4-alpine,webdevops/php:8.4-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.4-alpine + push: true + tags: 'ghcr.io/webdevops/php:8.4-alpine,webdevops/php:8.4-alpine' + platforms: linux/amd64 + php_8-5: + name: 'webdevops/php:8.5' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.5 + load: true + tags: 'ghcr.io/webdevops/php:8.5,webdevops/php:8.5' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.5" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.5 + push: true + tags: 'ghcr.io/webdevops/php:8.5,webdevops/php:8.5' + platforms: linux/amd64 + php_8-5-alpine: + name: 'webdevops/php:8.5-alpine' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.5-alpine + load: true + tags: 'ghcr.io/webdevops/php:8.5-alpine,webdevops/php:8.5-alpine' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-official/8.5-alpine + push: true + tags: 'ghcr.io/webdevops/php:8.5-alpine,webdevops/php:8.5-alpine' + platforms: linux/amd64 + storage_latest: + name: 'webdevops/storage:latest' + needs: + - toolbox_latest + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/storage/latest + load: true + tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' + platforms: linux/amd64 + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/storage/latest + push: true + tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' + platforms: linux/amd64 + toolbox_latest: + name: 'webdevops/toolbox:latest' + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/toolbox/latest + load: true + tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' + platforms: linux/amd64 + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/toolbox/latest + push: true + tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' + platforms: linux/amd64 + vsftp_latest: + name: 'webdevops/vsftp:latest' + needs: + - base_ubuntu-22-04 + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-qemu-action@v3 + - + uses: docker/setup-buildx-action@v3 + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "github.ref == 'refs/heads/github-actions'" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/vsftp/latest + load: true + tags: 'ghcr.io/webdevops/vsftp:latest,webdevops/vsftp:latest' + platforms: linux/amd64 + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM webdevops/vsftp:latest" >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "github.ref == 'refs/heads/github-actions'" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/vsftp/latest + push: true + tags: 'ghcr.io/webdevops/vsftp:latest,webdevops/vsftp:latest' + platforms: linux/amd64 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 51b5b11fd..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,1455 +0,0 @@ -stages: - - level1 - - level2 - - level3 - - level4 - - level5 -'webdevops/toolbox:latest': - stage: level1 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/toolbox/latest' - - 'docker build --no-cache -t webdevops/toolbox:latest .' - - 'docker push webdevops/toolbox:latest' - - 'docker tag webdevops/toolbox:latest $CI_REGISTRY_IMAGE/toolbox:latest' - - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' -'webdevops/bootstrap:alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/bootstrap/alpine' - - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_696e41bf715e49.28746787' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf715e49.28746787' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE1ZTQ5LjI4NzQ2Nzg3In0= Dockerfile_696e41bf715e49.28746787' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - - 'docker push webdevops/bootstrap:alpine' - - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/bootstrap:ubuntu-22.04': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/bootstrap/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_696e41bf716ce1.41077306' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf716ce1.41077306' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTZjZTEuNDEwNzczMDYifQ== Dockerfile_696e41bf716ce1.41077306' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - - 'docker push webdevops/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' - - 'docker push webdevops/bootstrap:latest' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.1': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.1' - - 'docker build --no-cache -t webdevops/php:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_696e41bf6f49d7.91458876' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f49d7.91458876' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY0OWQ3LjkxNDU4ODc2In0= Dockerfile_696e41bf6f49d7.91458876' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - - 'docker push webdevops/php:8.1' - - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1' - - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' - - 'docker push webdevops/php-official:8.1' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.1-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.1-alpine' - - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_696e41bf7108a3.56249255' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7108a3.56249255' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMDhhMy41NjI0OTI1NSJ9 Dockerfile_696e41bf7108a3.56249255' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - - 'docker push webdevops/php-official:8.1-alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.2': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.2' - - 'docker build --no-cache -t webdevops/php:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_696e41bf708099.97589782' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708099.97589782' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzA4MDk5Ljk3NTg5NzgyIn0= Dockerfile_696e41bf708099.97589782' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - - 'docker push webdevops/php:8.2' - - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - - 'docker push webdevops/php-official:8.2' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.2-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.2-alpine' - - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_696e41bf700ff4.24016900' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf700ff4.24016900' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMGZmNC4yNDAxNjkwMCJ9 Dockerfile_696e41bf700ff4.24016900' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' - - 'docker push webdevops/php-official:8.2-alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.3': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.3' - - 'docker build --no-cache -t webdevops/php:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_696e41bf713bc8.10046836' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713bc8.10046836' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzEzYmM4LjEwMDQ2ODM2In0= Dockerfile_696e41bf713bc8.10046836' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - - 'docker push webdevops/php:8.3' - - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3' - - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' - - 'docker push webdevops/php-official:8.3' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.3-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.3-alpine' - - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_696e41bf6f7002.48429078' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7002.48429078' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNzAwMi40ODQyOTA3OCJ9 Dockerfile_696e41bf6f7002.48429078' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' - - 'docker push webdevops/php-official:8.3-alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.4': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.4' - - 'docker build --no-cache -t webdevops/php:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4" >> Dockerfile_696e41bf70c101.58709433' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70c101.58709433' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzBjMTAxLjU4NzA5NDMzIn0= Dockerfile_696e41bf70c101.58709433' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml' - - 'docker push webdevops/php:8.4' - - 'docker tag webdevops/php:8.4 $CI_REGISTRY_IMAGE/php:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php:8.4' - - 'docker tag webdevops/php:8.4 webdevops/php-official:8.4' - - 'docker push webdevops/php-official:8.4' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.4-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.4-alpine' - - 'docker build --no-cache -t webdevops/php:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_696e41bf702a37.11277934' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702a37.11277934' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMmEzNy4xMTI3NzkzNCJ9 Dockerfile_696e41bf702a37.11277934' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.4-alpine' - - 'docker tag webdevops/php:8.4-alpine $CI_REGISTRY_IMAGE/php:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.4-alpine' - - 'docker tag webdevops/php:8.4-alpine webdevops/php-official:8.4-alpine' - - 'docker push webdevops/php-official:8.4-alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.5': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.5' - - 'docker build --no-cache -t webdevops/php:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.5" >> Dockerfile_696e41bf6fe7a5.53256182' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fe7a5.53256182' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmZlN2E1LjUzMjU2MTgyIn0= Dockerfile_696e41bf6fe7a5.53256182' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml' - - 'docker push webdevops/php:8.5' - - 'docker tag webdevops/php:8.5 $CI_REGISTRY_IMAGE/php:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php:8.5' - - 'docker tag webdevops/php:8.5 webdevops/php-official:8.5' - - 'docker push webdevops/php-official:8.5' - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.5-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.5-alpine' - - 'docker build --no-cache -t webdevops/php:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_696e41bf7127d2.56598904' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7127d2.56598904' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMjdkMi41NjU5ODkwNCJ9 Dockerfile_696e41bf7127d2.56598904' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.5-alpine' - - 'docker tag webdevops/php:8.5-alpine $CI_REGISTRY_IMAGE/php:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.5-alpine' - - 'docker tag webdevops/php:8.5-alpine webdevops/php-official:8.5-alpine' - - 'docker push webdevops/php-official:8.5-alpine' - needs: - - 'webdevops/toolbox:latest' -'webdevops/storage:latest': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/storage/latest' - - 'docker build --no-cache -t webdevops/storage:latest .' - - 'docker push webdevops/storage:latest' - - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' - - 'docker push $CI_REGISTRY_IMAGE/storage:latest' - needs: - - 'webdevops/toolbox:latest' -'webdevops/base:alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base/alpine' - - 'docker build --no-cache -t webdevops/base:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_696e41bf7160e6.29634751' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7160e6.29634751' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNjBlNi4yOTYzNDc1MSJ9 Dockerfile_696e41bf7160e6.29634751' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - - 'docker push webdevops/base:alpine' - - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base:alpine' - needs: - - 'webdevops/bootstrap:alpine' -'webdevops/base:ubuntu-22.04': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_696e41bf717072.29744626' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717072.29744626' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE3MDcyLjI5NzQ0NjI2In0= Dockerfile_696e41bf717072.29744626' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - - 'docker push webdevops/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' - - 'docker push webdevops/base:latest' - needs: - - 'webdevops/bootstrap:ubuntu-22.04' -'webdevops/php-apache:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1' - - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_696e41bf6f4ee3.86314782' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f4ee3.86314782' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNGVlMy44NjMxNDc4MiJ9 Dockerfile_696e41bf6f4ee3.86314782' - - 'docker push webdevops/php-apache:8.1' - - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' - needs: - - 'webdevops/php:8.1' -'webdevops/php-apache:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_696e41bf711460.00724786' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711460.00724786' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTE0NjAuMDA3MjQ3ODYifQ== Dockerfile_696e41bf711460.00724786' - - 'docker push webdevops/php-apache:8.1-alpine' - - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.2' - - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_696e41bf708487.81740578' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708487.81740578' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwODQ4Ny44MTc0MDU3OCJ9 Dockerfile_696e41bf708487.81740578' - - 'docker push webdevops/php-apache:8.2' - - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' - needs: - - 'webdevops/php:8.2' -'webdevops/php-apache:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_696e41bf7016f6.25944727' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7016f6.25944727' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDE2ZjYuMjU5NDQ3MjcifQ== Dockerfile_696e41bf7016f6.25944727' - - 'docker push webdevops/php-apache:8.2-alpine' - - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-apache:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.3' - - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_696e41bf713d71.80728564' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713d71.80728564' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxM2Q3MS44MDcyODU2NCJ9 Dockerfile_696e41bf713d71.80728564' - - 'docker push webdevops/php-apache:8.3' - - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' - needs: - - 'webdevops/php:8.3' -'webdevops/php-apache:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_696e41bf6f7711.41882184' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7711.41882184' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2Zjc3MTEuNDE4ODIxODQifQ== Dockerfile_696e41bf6f7711.41882184' - - 'docker push webdevops/php-apache:8.3-alpine' - - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-apache:8.4': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.4' - - 'docker build --no-cache -t webdevops/php-apache:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4" >> Dockerfile_696e41bf70c262.97404682' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70c262.97404682' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwYzI2Mi45NzQwNDY4MiJ9 Dockerfile_696e41bf70c262.97404682' - - 'docker push webdevops/php-apache:8.4' - - 'docker tag webdevops/php-apache:8.4 $CI_REGISTRY_IMAGE/php-apache:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4' - needs: - - 'webdevops/php:8.4' -'webdevops/php-apache:8.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_696e41bf702c66.83759887' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702c66.83759887' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDJjNjYuODM3NTk4ODcifQ== Dockerfile_696e41bf702c66.83759887' - - 'docker push webdevops/php-apache:8.4-alpine' - - 'docker tag webdevops/php-apache:8.4-alpine $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.4-alpine' - needs: - - 'webdevops/php:8.4-alpine' -'webdevops/php-apache:8.5': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.5' - - 'docker build --no-cache -t webdevops/php-apache:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.5" >> Dockerfile_696e41bf6fe9f3.56404781' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fe9f3.56404781' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZTlmMy41NjQwNDc4MSJ9 Dockerfile_696e41bf6fe9f3.56404781' - - 'docker push webdevops/php-apache:8.5' - - 'docker tag webdevops/php-apache:8.5 $CI_REGISTRY_IMAGE/php-apache:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5' - needs: - - 'webdevops/php:8.5' -'webdevops/php-apache:8.5-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.5-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_696e41bf712c49.43452379' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712c49.43452379' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTJjNDkuNDM0NTIzNzkifQ== Dockerfile_696e41bf712c49.43452379' - - 'docker push webdevops/php-apache:8.5-alpine' - - 'docker tag webdevops/php-apache:8.5-alpine $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.5-alpine' - needs: - - 'webdevops/php:8.5-alpine' -'webdevops/php-dev:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.1' - - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_696e41bf6f5501.55640001' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f5501.55640001' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNTUwMS41NTY0MDAwMSJ9 Dockerfile_696e41bf6f5501.55640001' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1' - - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' - needs: - - 'webdevops/php:8.1' -'webdevops/php-dev:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_696e41bf711ea0.98934750' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711ea0.98934750' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTFlYTAuOTg5MzQ3NTAifQ== Dockerfile_696e41bf711ea0.98934750' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1-alpine' - - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-dev:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.2' - - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_696e41bf708e83.46250268' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708e83.46250268' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwOGU4My40NjI1MDI2OCJ9 Dockerfile_696e41bf708e83.46250268' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2' - - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' - needs: - - 'webdevops/php:8.2' -'webdevops/php-dev:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_696e41bf701ea1.65363229' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf701ea1.65363229' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDFlYTEuNjUzNjMyMjkifQ== Dockerfile_696e41bf701ea1.65363229' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2-alpine' - - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-dev:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.3' - - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_696e41bf7144c9.98354223' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7144c9.98354223' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNDRjOS45ODM1NDIyMyJ9 Dockerfile_696e41bf7144c9.98354223' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3' - - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' - needs: - - 'webdevops/php:8.3' -'webdevops/php-dev:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_696e41bf6f8290.33010211' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f8290.33010211' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZjgyOTAuMzMwMTAyMTEifQ== Dockerfile_696e41bf6f8290.33010211' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3-alpine' - - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-dev:8.4': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.4' - - 'docker build --no-cache -t webdevops/php-dev:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4" >> Dockerfile_696e41bf70d1c4.92178512' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70d1c4.92178512' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwZDFjNC45MjE3ODUxMiJ9 Dockerfile_696e41bf70d1c4.92178512' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.4' - - 'docker tag webdevops/php-dev:8.4 $CI_REGISTRY_IMAGE/php-dev:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4' - needs: - - 'webdevops/php:8.4' -'webdevops/php-dev:8.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.4-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_696e41bf7034b9.18377781' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7034b9.18377781' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDM0YjkuMTgzNzc3ODEifQ== Dockerfile_696e41bf7034b9.18377781' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.4-alpine' - - 'docker tag webdevops/php-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.4-alpine' - needs: - - 'webdevops/php:8.4-alpine' -'webdevops/php-dev:8.5': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.5' - - 'docker build --no-cache -t webdevops/php-dev:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.5" >> Dockerfile_696e41bf6fec21.70258039' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fec21.70258039' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZWMyMS43MDI1ODAzOSJ9 Dockerfile_696e41bf6fec21.70258039' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.5' - - 'docker tag webdevops/php-dev:8.5 $CI_REGISTRY_IMAGE/php-dev:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5' - needs: - - 'webdevops/php:8.5' -'webdevops/php-dev:8.5-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.5-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_696e41bf713353.08634189' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf713353.08634189' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTMzNTMuMDg2MzQxODkifQ== Dockerfile_696e41bf713353.08634189' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.5-alpine' - - 'docker tag webdevops/php-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.5-alpine' - needs: - - 'webdevops/php:8.5-alpine' -'webdevops/php-nginx:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.1' - - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_696e41bf6f62a4.85222163' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f62a4.85222163' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY2MmE0Ljg1MjIyMTYzIn0= Dockerfile_696e41bf6f62a4.85222163' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1' - - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' - needs: - - 'webdevops/php:8.1' -'webdevops/php-nginx:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_696e41bf712274.14410517' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712274.14410517' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMjI3NC4xNDQxMDUxNyJ9 Dockerfile_696e41bf712274.14410517' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1-alpine' - - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.2' - - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_696e41bf7091b2.50487077' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7091b2.50487077' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzA5MWIyLjUwNDg3MDc3In0= Dockerfile_696e41bf7091b2.50487077' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2' - - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' - needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_696e41bf702546.04517749' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702546.04517749' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMjU0Ni4wNDUxNzc0OSJ9 Dockerfile_696e41bf702546.04517749' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2-alpine' - - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.3' - - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_696e41bf714811.99513491' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714811.99513491' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE0ODExLjk5NTEzNDkxIn0= Dockerfile_696e41bf714811.99513491' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3' - - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' - needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_696e41bf6f85f4.05297345' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f85f4.05297345' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmODVmNC4wNTI5NzM0NSJ9 Dockerfile_696e41bf6f85f4.05297345' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3-alpine' - - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-nginx:8.4': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.4' - - 'docker build --no-cache -t webdevops/php-nginx:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_696e41bf70dc05.37653427' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70dc05.37653427' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzBkYzA1LjM3NjUzNDI3In0= Dockerfile_696e41bf70dc05.37653427' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.4' - - 'docker tag webdevops/php-nginx:8.4 $CI_REGISTRY_IMAGE/php-nginx:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4' - needs: - - 'webdevops/php:8.4' -'webdevops/php-nginx:8.4-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.4-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_696e41bf703766.88631265' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf703766.88631265' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwMzc2Ni44ODYzMTI2NSJ9 Dockerfile_696e41bf703766.88631265' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.4-alpine' - - 'docker tag webdevops/php-nginx:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.4-alpine' - needs: - - 'webdevops/php:8.4-alpine' -'webdevops/php-nginx:8.5': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.5' - - 'docker build --no-cache -t webdevops/php-nginx:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_696e41bf6fef00.47980376' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6fef00.47980376' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmZlZjAwLjQ3OTgwMzc2In0= Dockerfile_696e41bf6fef00.47980376' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.5' - - 'docker tag webdevops/php-nginx:8.5 $CI_REGISTRY_IMAGE/php-nginx:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5' - needs: - - 'webdevops/php:8.5' -'webdevops/php-nginx:8.5-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.5-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_696e41bf7135a2.65923845' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7135a2.65923845' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxMzVhMi42NTkyMzg0NSJ9 Dockerfile_696e41bf7135a2.65923845' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.5-alpine' - - 'docker tag webdevops/php-nginx:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.5-alpine' - needs: - - 'webdevops/php:8.5-alpine' -'webdevops/apache:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/apache/alpine' - - 'docker build --no-cache -t webdevops/apache:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_696e41bf7162b9.73549954' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7162b9.73549954' - - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzE2MmI5LjczNTQ5OTU0In0= Dockerfile_696e41bf7162b9.73549954' - - 'docker push webdevops/apache:alpine' - - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' - needs: - - 'webdevops/base:alpine' -'webdevops/base-app:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base-app/alpine' - - 'docker build --no-cache -t webdevops/base-app:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_696e41bf7169e4.26706147' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7169e4.26706147' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTY5ZTQuMjY3MDYxNDcifQ== Dockerfile_696e41bf7169e4.26706147' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - - 'docker push webdevops/base-app:alpine' - - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' - needs: - - 'webdevops/base:alpine' -'webdevops/base-app:ubuntu-22.04': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base-app/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_696e41bf717aa5.90037060' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717aa5.90037060' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxN2FhNS45MDAzNzA2MCJ9 Dockerfile_696e41bf717aa5.90037060' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - - 'docker push webdevops/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' - - 'docker push webdevops/base-app:latest' - needs: - - 'webdevops/base:ubuntu-22.04' -'webdevops/nginx:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/nginx/alpine' - - 'docker build --no-cache -t webdevops/nginx:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_696e41bf716588.37759391' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf716588.37759391' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTY1ODguMzc3NTkzOTEifQ== Dockerfile_696e41bf716588.37759391' - - 'docker push webdevops/nginx:alpine' - - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' - needs: - - 'webdevops/base:alpine' -'webdevops/php-apache-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_696e41bf6f5241.22348086' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f5241.22348086' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZjUyNDEuMjIzNDgwODYifQ== Dockerfile_696e41bf6f5241.22348086' - - 'docker push webdevops/php-apache-dev:8.1' - - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - needs: - - 'webdevops/php-apache:8.1' -'webdevops/php-apache-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_696e41bf711870.34792511' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf711870.34792511' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzExODcwLjM0NzkyNTExIn0= Dockerfile_696e41bf711870.34792511' - - 'docker push webdevops/php-apache-dev:8.1-alpine' - - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - needs: - - 'webdevops/php-apache:8.1-alpine' -'webdevops/php-apache-dev:8.2': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.2' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_696e41bf708a12.21004060' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf708a12.21004060' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDhhMTIuMjEwMDQwNjAifQ== Dockerfile_696e41bf708a12.21004060' - - 'docker push webdevops/php-apache-dev:8.2' - - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - needs: - - 'webdevops/php-apache:8.2' -'webdevops/php-apache-dev:8.2-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_696e41bf701c98.00849673' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf701c98.00849673' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzAxYzk4LjAwODQ5NjczIn0= Dockerfile_696e41bf701c98.00849673' - - 'docker push webdevops/php-apache-dev:8.2-alpine' - - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - needs: - - 'webdevops/php-apache:8.2-alpine' -'webdevops/php-apache-dev:8.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.3' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_696e41bf714124.57080261' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714124.57080261' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTQxMjQuNTcwODAyNjEifQ== Dockerfile_696e41bf714124.57080261' - - 'docker push webdevops/php-apache-dev:8.3' - - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - needs: - - 'webdevops/php-apache:8.3' -'webdevops/php-apache-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_696e41bf6f7c50.10145806' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f7c50.10145806' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNmY3YzUwLjEwMTQ1ODA2In0= Dockerfile_696e41bf6f7c50.10145806' - - 'docker push webdevops/php-apache-dev:8.3-alpine' - - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - needs: - - 'webdevops/php-apache:8.3-alpine' -'webdevops/php-apache-dev:8.4': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.4' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_696e41bf70cb73.19332399' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70cb73.19332399' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MGNiNzMuMTkzMzIzOTkifQ== Dockerfile_696e41bf70cb73.19332399' - - 'docker push webdevops/php-apache-dev:8.4' - - 'docker tag webdevops/php-apache-dev:8.4 $CI_REGISTRY_IMAGE/php-apache-dev:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4' - needs: - - 'webdevops/php-apache:8.4' -'webdevops/php-apache-dev:8.4-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.4-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_696e41bf702ec0.44102326' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf702ec0.44102326' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzAyZWMwLjQ0MTAyMzI2In0= Dockerfile_696e41bf702ec0.44102326' - - 'docker push webdevops/php-apache-dev:8.4-alpine' - - 'docker tag webdevops/php-apache-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.4-alpine' - needs: - - 'webdevops/php-apache:8.4-alpine' -'webdevops/php-apache-dev:8.5': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.5' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_696e41bf6feb22.73737623' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6feb22.73737623' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2ZmViMjIuNzM3Mzc2MjMifQ== Dockerfile_696e41bf6feb22.73737623' - - 'docker push webdevops/php-apache-dev:8.5' - - 'docker tag webdevops/php-apache-dev:8.5 $CI_REGISTRY_IMAGE/php-apache-dev:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5' - needs: - - 'webdevops/php-apache:8.5' -'webdevops/php-apache-dev:8.5-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.5-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_696e41bf712f32.75923310' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712f32.75923310' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY5NmU0MWJmNzEyZjMyLjc1OTIzMzEwIn0= Dockerfile_696e41bf712f32.75923310' - - 'docker push webdevops/php-apache-dev:8.5-alpine' - - 'docker tag webdevops/php-apache-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.5-alpine' - needs: - - 'webdevops/php-apache:8.5-alpine' -'webdevops/php-nginx-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.1' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_696e41bf6f6be8.20061357' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f6be8.20061357' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmNmJlOC4yMDA2MTM1NyJ9 Dockerfile_696e41bf6f6be8.20061357' - - 'docker push webdevops/php-nginx-dev:8.1' - - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - needs: - - 'webdevops/php-nginx:8.1' -'webdevops/php-nginx-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_696e41bf712602.77473730' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf712602.77473730' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTI2MDIuNzc0NzM3MzAifQ== Dockerfile_696e41bf712602.77473730' - - 'docker push webdevops/php-nginx-dev:8.1-alpine' - - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - needs: - - 'webdevops/php-nginx:8.1-alpine' -'webdevops/php-nginx-dev:8.2': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.2' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_696e41bf709352.38990294' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf709352.38990294' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwOTM1Mi4zODk5MDI5NCJ9 Dockerfile_696e41bf709352.38990294' - - 'docker push webdevops/php-nginx-dev:8.2' - - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - needs: - - 'webdevops/php-nginx:8.2' -'webdevops/php-nginx-dev:8.2-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_696e41bf7028d7.64655733' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7028d7.64655733' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDI4ZDcuNjQ2NTU3MzMifQ== Dockerfile_696e41bf7028d7.64655733' - - 'docker push webdevops/php-nginx-dev:8.2-alpine' - - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - needs: - - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-nginx-dev:8.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_696e41bf714c38.47956006' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf714c38.47956006' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNGMzOC40Nzk1NjAwNiJ9 Dockerfile_696e41bf714c38.47956006' - - 'docker push webdevops/php-nginx-dev:8.3' - - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - needs: - - 'webdevops/php-nginx:8.3' -'webdevops/php-nginx-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_696e41bf6f89d4.11952215' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6f89d4.11952215' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY2Zjg5ZDQuMTE5NTIyMTUifQ== Dockerfile_696e41bf6f89d4.11952215' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - needs: - - 'webdevops/php-nginx:8.3-alpine' -'webdevops/php-nginx-dev:8.4': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.4' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_696e41bf70e354.37905290' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf70e354.37905290' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcwZTM1NC4zNzkwNTI5MCJ9 Dockerfile_696e41bf70e354.37905290' - - 'docker push webdevops/php-nginx-dev:8.4' - - 'docker tag webdevops/php-nginx-dev:8.4 $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4' - needs: - - 'webdevops/php-nginx:8.4' -'webdevops/php-nginx-dev:8.4-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.4-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.4-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_696e41bf703c32.25000483' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf703c32.25000483' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MDNjMzIuMjUwMDA0ODMifQ== Dockerfile_696e41bf703c32.25000483' - - 'docker push webdevops/php-nginx-dev:8.4-alpine' - - 'docker tag webdevops/php-nginx-dev:8.4-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.4-alpine' - needs: - - 'webdevops/php-nginx:8.4-alpine' -'webdevops/php-nginx-dev:8.5': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.5' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_696e41bf6ff591.40436400' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf6ff591.40436400' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjZmZjU5MS40MDQzNjQwMCJ9 Dockerfile_696e41bf6ff591.40436400' - - 'docker push webdevops/php-nginx-dev:8.5' - - 'docker tag webdevops/php-nginx-dev:8.5 $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5' - needs: - - 'webdevops/php-nginx:8.5' -'webdevops/php-nginx-dev:8.5-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.5-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.5-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_696e41bf7138e8.37665030' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf7138e8.37665030' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjk2ZTQxYmY3MTM4ZTguMzc2NjUwMzAifQ== Dockerfile_696e41bf7138e8.37665030' - - 'docker push webdevops/php-nginx-dev:8.5-alpine' - - 'docker tag webdevops/php-nginx-dev:8.5-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.5-alpine' - needs: - - 'webdevops/php-nginx:8.5-alpine' -'webdevops/vsftp:latest': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/vsftp/latest' - - 'docker build --no-cache -t webdevops/vsftp:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_696e41bf717783.29372385' - - 'echo "COPY conf/ /" >> Dockerfile_696e41bf717783.29372385' - - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82OTZlNDFiZjcxNzc4My4yOTM3MjM4NSJ9 Dockerfile_696e41bf717783.29372385' - - 'docker push webdevops/vsftp:latest' - - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' - needs: - - 'webdevops/base:ubuntu-22.04' -'webdevops/dockerfile-build-env:latest': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/dockerfile-build-env/latest' - - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' - - 'docker push webdevops/dockerfile-build-env:latest' - - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - needs: - - 'webdevops/base-app:ubuntu-22.04' diff --git a/README.md b/README.md index e89457efd..e8887c0cb 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ We generate a multi stage Gitlab-CI configuration using PHP: ``` docker run --rm -ti -v $PWD:/app -w /app/ci webdevops/php:8.4-alpine composer install -docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console gitlab:generate +docker run --rm -ti -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console github:generate ``` Gitlab CI builds every image independent and runs serverspec and structure tests on every @@ -64,37 +64,31 @@ As in many projects the documentation is kind of up to date 😅. The following images which are currently supported are based on `php:{VER}-fpm-buster`. -* `webdevops/php:8.0` * `webdevops/php:8.1` * `webdevops/php:8.2` * `webdevops/php:8.3` * `webdevops/php:8.4` * `webdevops/php:8.5` -* `webdevops/php-dev:8.0` * `webdevops/php-dev:8.1` * `webdevops/php-dev:8.2` * `webdevops/php-dev:8.3` * `webdevops/php-dev:8.4` * `webdevops/php-dev:8.5` -* `webdevops/php-apache:8.0` * `webdevops/php-apache:8.1` * `webdevops/php-apache:8.2` * `webdevops/php-apache:8.3` * `webdevops/php-apache:8.4` * `webdevops/php-apache:8.5` -* `webdevops/php-apache-dev:8.0` * `webdevops/php-apache-dev:8.1` * `webdevops/php-apache-dev:8.2` * `webdevops/php-apache-dev:8.3` * `webdevops/php-apache-dev:8.4` * `webdevops/php-apache-dev:8.5` -* `webdevops/php-nginx:8.0` * `webdevops/php-nginx:8.1` * `webdevops/php-nginx:8.2` * `webdevops/php-nginx:8.3` * `webdevops/php-nginx:8.4` * `webdevops/php-nginx:8.5` -* `webdevops/php-nginx-dev:8.0` * `webdevops/php-nginx-dev:8.1` * `webdevops/php-nginx-dev:8.2` * `webdevops/php-nginx-dev:8.3` @@ -106,37 +100,31 @@ The following images which are currently supported are based on `php:{VER}-fpm-b The following images which are currently supported are based on `php:{VER}-fpm-alpine`. -* `webdevops/php:8.0-alpine` * `webdevops/php:8.1-alpine` * `webdevops/php:8.2-alpine` * `webdevops/php:8.3-alpine` * `webdevops/php:8.4-alpine` * `webdevops/php:8.5-alpine` -* `webdevops/php-dev:8.0-alpine` * `webdevops/php-dev:8.1-alpine` * `webdevops/php-dev:8.2-alpine` * `webdevops/php-dev:8.3-alpine` * `webdevops/php-dev:8.4-alpine` * `webdevops/php-dev:8.5-alpine` -* `webdevops/php-apache:8.0-alpine` * `webdevops/php-apache:8.1-alpine` * `webdevops/php-apache:8.2-alpine` * `webdevops/php-apache:8.3-alpine` * `webdevops/php-apache:8.4-alpine` * `webdevops/php-apache:8.5-alpine` -* `webdevops/php-apache-dev:8.0-alpine` * `webdevops/php-apache-dev:8.1-alpine` * `webdevops/php-apache-dev:8.2-alpine` * `webdevops/php-apache-dev:8.3-alpine` * `webdevops/php-apache-dev:8.4-alpine` * `webdevops/php-apache-dev:8.5-alpine` -* `webdevops/php-nginx:8.0-alpine` * `webdevops/php-nginx:8.1-alpine` * `webdevops/php-nginx:8.2-alpine` * `webdevops/php-nginx:8.3-alpine` * `webdevops/php-nginx:8.4-alpine` * `webdevops/php-nginx:8.5-alpine` -* `webdevops/php-nginx-dev:8.0-alpine` * `webdevops/php-nginx-dev:8.1-alpine` * `webdevops/php-nginx-dev:8.2-alpine` * `webdevops/php-nginx-dev:8.3-alpine` diff --git a/ci/console b/ci/console index 80eec83de..f769b189e 100755 --- a/ci/console +++ b/ci/console @@ -5,11 +5,11 @@ require __DIR__ . '/vendor/autoload.php'; use Symfony\Component\Console\Application; -use Webdevops\Build\Commands\GitlabCommand; +use Webdevops\Build\Commands\GithubCommand; $application = new Application(); // ... register commands -$application->add(new GitlabCommand()); +$application->add(new GithubCommand()); $application->run(); diff --git a/ci/src/Commands/GitlabCommand.php b/ci/src/Commands/GithubCommand.php similarity index 62% rename from ci/src/Commands/GitlabCommand.php rename to ci/src/Commands/GithubCommand.php index a87caddd0..71f41ed8a 100644 --- a/ci/src/Commands/GitlabCommand.php +++ b/ci/src/Commands/GithubCommand.php @@ -4,16 +4,18 @@ use BlueM\Tree; use BlueM\Tree\Node; -use BlueM\Tree\Serializer\HierarchicalTreeJsonSerializer; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Yaml; use Webdevops\Build\FileReader; -use Webdevops\Build\JobBuilder; +use Webdevops\Build\GithubJobBuilder; -class GitlabCommand extends Command +use function ksort; +use function var_dump; + +class GithubCommand extends Command { protected $output; protected $fileReader; @@ -23,12 +25,12 @@ class GitlabCommand extends Command protected $blacklist = []; protected $_settings = []; - protected static $defaultName = 'gitlab:generate-ci'; + protected static $defaultName = 'github:generate-ci'; public function __construct() { $this->fileReader = new FileReader(); - $this->jobBuilder = new JobBuilder(); + $this->jobBuilder = new GithubJobBuilder(); parent::__construct(); $this->addOption('blacklist', 'b', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY); $this->_settings = Yaml::parseFile(__DIR__ . '/../../../conf/console.yml'); @@ -45,19 +47,34 @@ protected function execute(InputInterface $input, OutputInterface $output) foreach ($tree->getRootNodes() as $rootNode) { $this->traverse($rootNode); } - $gitlabCi['stages'] = array_map(function($level) {return 'level' . $level;}, range(1, $this->deepestLevel)); - ksort($this->jobs); // system independent order of jobs (sorted by stage) - uasort($this->jobs, function($a, $b) { - return $a['stage'] <=> $b['stage']; - }); + ksort($this->jobs); // system independent order of jobs - $yaml = Yaml::dump(array_merge($gitlabCi, $this->jobs), 3, 2); - file_put_contents(__DIR__ . '/../../../.gitlab-ci.yml', $yaml); + $buildYaml = [ + 'name' => 'build', + 'on' => [ + 'schedule' => [ + ['cron' => '0 0 * * 2'], // every week on Tuesday + ], + 'push' => null, + 'pull_request' => [ + 'branches' => ['master'], + ], + 'workflow_dispatch' => null, + ], + 'jobs' => $this->jobs, + ]; + $yamlString = Yaml::dump( + $buildYaml, + 99, + 2, + Yaml::DUMP_OBJECT_AS_MAP | Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK, + ); + file_put_contents(__DIR__ . '/../../../.github/workflows/build.yaml', $yamlString); return 0; } - private function traverse(Node $node) + private function traverse(Node $node): void { $line = 'Processing ' . $node->getName(); $nodeAr = $node->toArray(); @@ -65,12 +82,12 @@ private function traverse(Node $node) if ($node->getLevel() > $this->deepestLevel) { $this->deepestLevel = $node->getLevel(); } - $this->jobs[$node->getId()] = $this->jobBuilder->getJobDescription($nodeAr); + $this->jobs[GithubJobBuilder::toJobId($node->getId())] = $this->jobBuilder->getJobDescription($nodeAr); if ($this->isNameBlacklisted($nodeAr['id'])) { -// $this->jobs[$node->getId()] = array_merge($this->jobs[$node->getId()], ['when' => 'manual']); +// $this->jobs[GithubJobBuilder::toJobId($node->getId())] = array_merge($this->jobs[GithubJobBuilder::toJobId($node->getId())], ['when' => 'manual']); $line .= ' *blacklisted*'; if ($node->get('tag') !== $this->_settings['docker']['autoLatestTag']) { - unset($this->jobs[$node->getId()]); + unset($this->jobs[GithubJobBuilder::toJobId($node->getId())]); } } $this->output->write([str_pad('', $node->getLevel() - 1, "\t", STR_PAD_LEFT), $line, PHP_EOL]); @@ -79,7 +96,7 @@ private function traverse(Node $node) } } - private function isNameBlacklisted(string $name) + private function isNameBlacklisted(string $name): bool { foreach ($this->blacklist as $blacklistItem) { if (strpos($name, $blacklistItem)) { @@ -89,7 +106,7 @@ private function isNameBlacklisted(string $name) return false; } - private function buildTree() + private function buildTree(): Tree { $data = []; $dockerFiles = $this->fileReader->collectDockerfiles(); diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php new file mode 100644 index 000000000..c1f07b7cd --- /dev/null +++ b/ci/src/GithubJobBuilder.php @@ -0,0 +1,132 @@ +serverSpec($node); + $structuredTests = $this->structuredTests($node); + $job = []; + if ($node['parent'] ?? false) { + // put needs at the beginning + $job['needs'] = [GithubJobBuilder::toJobId($node['parent'])]; + } + $job = [ + 'name' => $node['name'], + ...$job, + 'runs-on' => 'ubuntu-latest', + 'container' => 'webdevops/dockerfile-build-env', + 'steps' => array_values( + array_filter( + [ + ['uses' => 'actions/checkout@v4'], + ['uses' => 'docker/setup-qemu-action@v3'], + ['uses' => 'docker/setup-buildx-action@v3'], + [ + 'if' => "github.ref == 'refs/heads/master'", + 'name' => 'Login to ghcr.io', + 'uses' => 'docker/login-action@v3', + 'with' => [ + 'registry' => 'ghcr.io', + 'username' => '${{ github.actor }}', + 'password' => '${{ secrets.GITHUB_TOKEN }}', + ], + ], + [ + 'if' => "github.ref == 'refs/heads/master'", + 'name' => 'Login to hub.docker.com', + 'uses' => 'docker/login-action@v3', + 'with' => [ + 'username' => '${{ secrets.DOCKERHUB_USERNAME }}', + 'password' => '${{ secrets.DOCKERHUB_TOKEN }}', + ], + ], + [ + 'name' => 'Build x64', + 'uses' => 'docker/build-push-action@v6', + 'with' => [ + 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), + 'load' => true, + 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], + 'platforms' => 'linux/amd64', + ], + ], + $serverSpec ? [ + 'name' => 'run serverspec', + 'run' => implode("\n", $serverSpec), + ] : null, + $structuredTests ? [ + 'name' => 'run structure-test', + 'run' => implode("\n", $structuredTests), + ] : null, + [ + 'if' => "github.ref == 'refs/heads/master'", + 'name' => 'Push', +// 'name' => 'Build ARM + Push', + 'uses' => 'docker/build-push-action@v6', + 'with' => [ + 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), + 'push' => true, + 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], + 'platforms' => 'linux/amd64', +// 'platforms' => 'linux/amd64,linux/arm64', // ARM not ready yet + ], + ], + ], + ), + ), + ]; + return $job; + } + + public static function toJobId(string $name): string + { + $name = strtolower($name); + $name = str_replace('webdevops/', '', $name); + $name = str_replace(['/', '.'], '-', $name); + $name = str_replace(':', '_', $name); + return $name; + } + + private function serverSpec(array $node): array + { + $specFile = sprintf('spec/docker/%s_spec.rb', $node['image']); + if (!file_exists(__DIR__ . '/../../tests/serverspec/' . $specFile)) { + return []; + } + +// $testDockerfile = uniqid('Dockerfile_', true); + $testDockerfile = 'Dockerfile_test'; + $specConfig = $node['serverspec']; + $specConfig['DOCKERFILE'] = $testDockerfile; + $encodedJsonConfig = base64_encode(json_encode($specConfig)); + $script = [ + 'cd tests/serverspec', + 'echo "FROM ' . $node['id'] . '" >> ' . $testDockerfile, + 'echo "COPY conf/ /" >> ' . $testDockerfile, + ]; + $script[] = 'bundle install'; + $script[] = 'bash serverspec.sh ' . $specFile . ' ' . $node['id'] . ' ' . $encodedJsonConfig . ' ' . $testDockerfile; + return $script; + } + + private function structuredTests(array $node): array + { + $script = []; + if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/test.yaml')) { + $script[] = 'cd tests/structure-test'; + if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/' . $node['tag'] . '/test.yaml')) { + $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml --config ' . $node['image'] . '/' . $node['tag'] . '/test.yaml'; + } else { + $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml'; + } + } + return $script; + } + +} diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php deleted file mode 100644 index 773e620ed..000000000 --- a/ci/src/JobBuilder.php +++ /dev/null @@ -1,99 +0,0 @@ -getBasicJobDefinition($node); - $jobDefinition['script'] = $this->buildScript($node); - return $jobDefinition; - } - - private function getBasicJobDefinition(array $node) - { - $job = [ - 'stage' => 'level' . $node['level'], - 'before_script' => [ - 'docker login -u $DOCKER_USER -p $DOCKER_PASS', - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY', - ], - 'image' => 'webdevops/dockerfile-build-env', - 'script' => [], -// 'retry' => 2, -// 'tags' => ['aws'], -// 'only' => ['master'], - ]; - if ($node['parent'] !== 0) { - $job['needs'] = [$node['parent']]; - } - return $job; - } - - private function buildScript(array $node) - { - $script = $this->buildImage($node); - $script = array_merge($script, $this->serverSpec($node)); - $script = array_merge($script, $this->structuredTests($node)); - $script = array_merge($script, $this->pushImage($node)); - return $script; - } - - private function buildImage(array $node) - { - return [ - 'cd ' . dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), - 'docker build --no-cache -t webdevops/' . $node['image'] . ':' . $node['tag'] . ' .', - ]; - } - - private function pushImage(array $node) - { - $script[] = 'docker push ' . $node['id']; - $script[] = 'docker tag ' . $node['id'] . ' $CI_REGISTRY_IMAGE/' . $node['image'] . ':' . $node['tag']; - $script[] = 'docker push $CI_REGISTRY_IMAGE/' . $node['image'] . ':' . $node['tag']; - foreach ($node['aliases'] as $alias) { - $script[] = 'docker tag ' . $node['id'] . ' ' . $alias; - $script[] = 'docker push ' . $alias; - } - return $script; - } - - private function serverSpec(array $node) - { - $specFile = sprintf('spec/docker/%s_spec.rb', $node['image']); - if (!file_exists(__DIR__ . '/../../tests/serverspec/' . $specFile)) { - return []; - } - - $testDockerfile = uniqid('Dockerfile_', true); - $specConfig = $node['serverspec']; - $specConfig['DOCKERFILE'] = $testDockerfile; - $encodedJsonConfig = base64_encode(json_encode($specConfig)); - $script = [ - 'cd $CI_PROJECT_DIR/tests/serverspec', - 'echo "FROM ' . $node['id'] . '" >> ' . $testDockerfile, - 'echo "COPY conf/ /" >> ' . $testDockerfile, - ]; - $script[] = 'bundle install'; - $script[] = 'bash serverspec.sh ' . $specFile . ' ' . $node['id'] .' ' . $encodedJsonConfig . ' ' . $testDockerfile; - return $script; - } - - private function structuredTests(array $node) - { - $script = []; - if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/test.yaml')) { - $script[] = 'cd $CI_PROJECT_DIR/tests/structure-test'; - if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/' . $node['tag'] . '/test.yaml')) { - $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml --config ' . $node['image'] . '/' . $node['tag'] . '/test.yaml'; - } else { - $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml'; - } - } - return $script; - } - -} diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile index 77c16ed38..4c3861bd4 100644 --- a/docker/php-official/8.5-alpine/Dockerfile +++ b/docker/php-official/8.5-alpine/Dockerfile @@ -158,6 +158,7 @@ RUN set -x \ gmp \ ffi \ imagick \ + amqp \ intl \ gettext \ ldap \ diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile index 5a407cbcd..0dc667ae0 100644 --- a/docker/php-official/8.5/Dockerfile +++ b/docker/php-official/8.5/Dockerfile @@ -146,6 +146,7 @@ RUN set -x \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install \ bcmath \ + amqp \ imagick \ ffi \ bz2 \ diff --git a/old.gitlab-ci.yml b/old.gitlab-ci.yml deleted file mode 100644 index 8bd08c4a4..000000000 --- a/old.gitlab-ci.yml +++ /dev/null @@ -1,1063 +0,0 @@ -stages: - - level1 - - level2 - - level3 - - level4 - - level5 -'webdevops/toolbox:latest': - stage: level1 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/toolbox/latest' - - 'docker build --no-cache -t webdevops/toolbox:latest .' - - 'docker push webdevops/toolbox:latest' - - 'docker tag webdevops/toolbox:latest $CI_REGISTRY_IMAGE/toolbox:latest' - - 'docker push $CI_REGISTRY_IMAGE/toolbox:latest' - tags: - - aws -'webdevops/bootstrap:alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/bootstrap/alpine' - - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_667f1a78e986a1.43610572' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e986a1.43610572' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk4NmExLjQzNjEwNTcyIn0= Dockerfile_667f1a78e986a1.43610572' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - - 'docker push webdevops/bootstrap:alpine' - - 'docker tag webdevops/bootstrap:alpine $CI_REGISTRY_IMAGE/bootstrap:alpine' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/base:alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base/alpine' - - 'docker build --no-cache -t webdevops/base:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_667f1a78e98b03.36105140' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98b03.36105140' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OGIwMy4zNjEwNTE0MCJ9 Dockerfile_667f1a78e98b03.36105140' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - - 'docker push webdevops/base:alpine' - - 'docker tag webdevops/base:alpine $CI_REGISTRY_IMAGE/base:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base:alpine' - tags: - - aws - needs: - - 'webdevops/bootstrap:alpine' -'webdevops/nginx:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/nginx/alpine' - - 'docker build --no-cache -t webdevops/nginx:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_667f1a78e98e48.66717548' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98e48.66717548' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOThlNDguNjY3MTc1NDgifQ== Dockerfile_667f1a78e98e48.66717548' - - 'docker push webdevops/nginx:alpine' - - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' - tags: - - aws - needs: - - 'webdevops/base:alpine' -'webdevops/apache:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/apache/alpine' - - 'docker build --no-cache -t webdevops/apache:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_667f1a78e99111.96614651' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99111.96614651' - - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5MTExLjk2NjE0NjUxIn0= Dockerfile_667f1a78e99111.96614651' - - 'docker push webdevops/apache:alpine' - - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' - tags: - - aws - needs: - - 'webdevops/base:alpine' -'webdevops/base-app:alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base-app/alpine' - - 'docker build --no-cache -t webdevops/base-app:alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_667f1a78e993c5.66917319' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e993c5.66917319' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTkzYzUuNjY5MTczMTkifQ== Dockerfile_667f1a78e993c5.66917319' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - - 'docker push webdevops/base-app:alpine' - - 'docker tag webdevops/base-app:alpine $CI_REGISTRY_IMAGE/base-app:alpine' - - 'docker push $CI_REGISTRY_IMAGE/base-app:alpine' - tags: - - aws - needs: - - 'webdevops/base:alpine' -'webdevops/bootstrap:ubuntu-22.04': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/bootstrap/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_667f1a78e996a9.79805936' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e996a9.79805936' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTk2YTkuNzk4MDU5MzYifQ== Dockerfile_667f1a78e996a9.79805936' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - - 'docker push webdevops/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/bootstrap:ubuntu-22.04' - - 'docker tag webdevops/bootstrap:ubuntu-22.04 webdevops/bootstrap:latest' - - 'docker push webdevops/bootstrap:latest' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/base:ubuntu-22.04': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_667f1a78e99961.24720922' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99961.24720922' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5OTYxLjI0NzIwOTIyIn0= Dockerfile_667f1a78e99961.24720922' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - - 'docker push webdevops/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base:ubuntu-22.04' - - 'docker tag webdevops/base:ubuntu-22.04 webdevops/base:latest' - - 'docker push webdevops/base:latest' - tags: - - aws - needs: - - 'webdevops/bootstrap:ubuntu-22.04' -'webdevops/base-app:ubuntu-22.04': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/base-app/ubuntu-22.04' - - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_667f1a78e99c11.48948582' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99c11.48948582' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OWMxMS40ODk0ODU4MiJ9 Dockerfile_667f1a78e99c11.48948582' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - - 'docker push webdevops/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker push $CI_REGISTRY_IMAGE/base-app:ubuntu-22.04' - - 'docker tag webdevops/base-app:ubuntu-22.04 webdevops/base-app:latest' - - 'docker push webdevops/base-app:latest' - tags: - - aws - needs: - - 'webdevops/base:ubuntu-22.04' -'webdevops/dockerfile-build-env:latest': - stage: level5 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/dockerfile-build-env/latest' - - 'docker build --no-cache -t webdevops/dockerfile-build-env:latest .' - - 'docker push webdevops/dockerfile-build-env:latest' - - 'docker tag webdevops/dockerfile-build-env:latest $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - - 'docker push $CI_REGISTRY_IMAGE/dockerfile-build-env:latest' - tags: - - aws - needs: - - 'webdevops/base-app:ubuntu-22.04' -'webdevops/vsftp:latest': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/vsftp/latest' - - 'docker build --no-cache -t webdevops/vsftp:latest .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_667f1a78e9a425.86024047' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9a425.86024047' - - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5YTQyNS44NjAyNDA0NyJ9 Dockerfile_667f1a78e9a425.86024047' - - 'docker push webdevops/vsftp:latest' - - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' - tags: - - aws - needs: - - 'webdevops/base:ubuntu-22.04' -'webdevops/storage:latest': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/storage/latest' - - 'docker build --no-cache -t webdevops/storage:latest .' - - 'docker push webdevops/storage:latest' - - 'docker tag webdevops/storage:latest $CI_REGISTRY_IMAGE/storage:latest' - - 'docker push $CI_REGISTRY_IMAGE/storage:latest' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php:8.2': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.2' - - 'docker build --no-cache -t webdevops/php:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_667f1a78e9c787.18338734' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9c787.18338734' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljNzg3LjE4MzM4NzM0In0= Dockerfile_667f1a78e9c787.18338734' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - - 'docker push webdevops/php:8.2' - - 'docker tag webdevops/php:8.2 $CI_REGISTRY_IMAGE/php:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2' - - 'docker tag webdevops/php:8.2 webdevops/php-official:8.2' - - 'docker push webdevops/php-official:8.2' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.2' - - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_667f1a78e9ca18.84839188' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ca18.84839188' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2ExOC44NDgzOTE4OCJ9 Dockerfile_667f1a78e9ca18.84839188' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2' - - 'docker tag webdevops/php-dev:8.2 $CI_REGISTRY_IMAGE/php-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2' - tags: - - aws - needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.2' - - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_667f1a78e9cc28.80853000' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cc28.80853000' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljYzI4LjgwODUzMDAwIn0= Dockerfile_667f1a78e9cc28.80853000' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2' - - 'docker tag webdevops/php-nginx:8.2 $CI_REGISTRY_IMAGE/php-nginx:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2' - tags: - - aws - needs: - - 'webdevops/php:8.2' -'webdevops/php-nginx-dev:8.2': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.2' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_667f1a78e9cf03.94640741' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cf03.94640741' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2YwMy45NDY0MDc0MSJ9 Dockerfile_667f1a78e9cf03.94640741' - - 'docker push webdevops/php-nginx-dev:8.2' - - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.2' -'webdevops/php-apache:8.2': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.2' - - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_667f1a78e9d122.49340362' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d122.49340362' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDEyMi40OTM0MDM2MiJ9 Dockerfile_667f1a78e9d122.49340362' - - 'docker push webdevops/php-apache:8.2' - - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' - tags: - - aws - needs: - - 'webdevops/php:8.2' -'webdevops/php-apache-dev:8.2': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.2' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_667f1a78e9d325.79477395' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d325.79477395' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWQzMjUuNzk0NzczOTUifQ== Dockerfile_667f1a78e9d325.79477395' - - 'docker push webdevops/php-apache-dev:8.2' - - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - tags: - - aws - needs: - - 'webdevops/php-apache:8.2' -'webdevops/php:8.3': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.3' - - 'docker build --no-cache -t webdevops/php:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_667f1a78e9d503.69654040' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d503.69654040' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkNTAzLjY5NjU0MDQwIn0= Dockerfile_667f1a78e9d503.69654040' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - - 'docker push webdevops/php:8.3' - - 'docker tag webdevops/php:8.3 $CI_REGISTRY_IMAGE/php:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3' - - 'docker tag webdevops/php:8.3 webdevops/php-official:8.3' - - 'docker push webdevops/php-official:8.3' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.3' - - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_667f1a78e9d745.04130984' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d745.04130984' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDc0NS4wNDEzMDk4NCJ9 Dockerfile_667f1a78e9d745.04130984' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3' - - 'docker tag webdevops/php-dev:8.3 $CI_REGISTRY_IMAGE/php-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3' - tags: - - aws - needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.3' - - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_667f1a78e9d9b6.72303514' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d9b6.72303514' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkOWI2LjcyMzAzNTE0In0= Dockerfile_667f1a78e9d9b6.72303514' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3' - - 'docker tag webdevops/php-nginx:8.3 $CI_REGISTRY_IMAGE/php-nginx:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3' - tags: - - aws - needs: - - 'webdevops/php:8.3' -'webdevops/php-nginx-dev:8.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_667f1a78e9dc76.11125850' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9dc76.11125850' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGM3Ni4xMTEyNTg1MCJ9 Dockerfile_667f1a78e9dc76.11125850' - - 'docker push webdevops/php-nginx-dev:8.3' - - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.3' -'webdevops/php-apache:8.3': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.3' - - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_667f1a78e9de76.40274417' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9de76.40274417' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGU3Ni40MDI3NDQxNyJ9 Dockerfile_667f1a78e9de76.40274417' - - 'docker push webdevops/php-apache:8.3' - - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' - tags: - - aws - needs: - - 'webdevops/php:8.3' -'webdevops/php-apache-dev:8.3': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.3' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_667f1a78e9e033.60561999' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9e033.60561999' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWUwMzMuNjA1NjE5OTkifQ== Dockerfile_667f1a78e9e033.60561999' - - 'docker push webdevops/php-apache-dev:8.3' - - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - tags: - - aws - needs: - - 'webdevops/php-apache:8.3' -'webdevops/php:8.2-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.2-alpine' - - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_667f1a78e9fd69.08017350' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9fd69.08017350' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZmQ2OS4wODAxNzM1MCJ9 Dockerfile_667f1a78e9fd69.08017350' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.2-alpine' - - 'docker tag webdevops/php:8.2-alpine webdevops/php-official:8.2-alpine' - - 'docker push webdevops/php-official:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_667f1a78e9ff80.10051609' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ff80.10051609' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWZmODAuMTAwNTE2MDkifQ== Dockerfile_667f1a78e9ff80.10051609' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.2-alpine' - - 'docker tag webdevops/php-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_667f1a78ea0223.80714897' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0223.80714897' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhMDIyMy44MDcxNDg5NyJ9 Dockerfile_667f1a78ea0223.80714897' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.2-alpine' - - 'docker tag webdevops/php-nginx:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-nginx-dev:8.2-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_667f1a78ea0482.28125239' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0482.28125239' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA0ODIuMjgxMjUyMzkifQ== Dockerfile_667f1a78ea0482.28125239' - - 'docker push webdevops/php-nginx-dev:8.2-alpine' - - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-apache:8.2-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_667f1a78ea06f5.64008708' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea06f5.64008708' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA2ZjUuNjQwMDg3MDgifQ== Dockerfile_667f1a78ea06f5.64008708' - - 'docker push webdevops/php-apache:8.2-alpine' - - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.2-alpine' -'webdevops/php-apache-dev:8.2-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.2-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_667f1a78ea0940.45216278' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0940.45216278' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWEwOTQwLjQ1MjE2Mjc4In0= Dockerfile_667f1a78ea0940.45216278' - - 'docker push webdevops/php-apache-dev:8.2-alpine' - - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.2-alpine' -'webdevops/php:8.1-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.1-alpine' - - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_667f1a78ea5481.67757977' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5481.67757977' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNTQ4MS42Nzc1Nzk3NyJ9 Dockerfile_667f1a78ea5481.67757977' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1-alpine' - - 'docker tag webdevops/php:8.1-alpine webdevops/php-official:8.1-alpine' - - 'docker push webdevops/php-official:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_667f1a78ea57d7.69758972' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea57d7.69758972' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTU3ZDcuNjk3NTg5NzIifQ== Dockerfile_667f1a78ea57d7.69758972' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1-alpine' - - 'docker tag webdevops/php-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_667f1a78ea5ad9.12373386' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5ad9.12373386' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNWFkOS4xMjM3MzM4NiJ9 Dockerfile_667f1a78ea5ad9.12373386' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1-alpine' - - 'docker tag webdevops/php-nginx:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-nginx-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_667f1a78ea5df7.88542972' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5df7.88542972' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTVkZjcuODg1NDI5NzIifQ== Dockerfile_667f1a78ea5df7.88542972' - - 'docker push webdevops/php-nginx-dev:8.1-alpine' - - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.1-alpine' -'webdevops/php-apache:8.1-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_667f1a78ea60d4.57421920' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea60d4.57421920' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTYwZDQuNTc0MjE5MjAifQ== Dockerfile_667f1a78ea60d4.57421920' - - 'docker push webdevops/php-apache:8.1-alpine' - - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.1-alpine' -'webdevops/php-apache-dev:8.1-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_667f1a78ea6379.68528757' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea6379.68528757' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE2Mzc5LjY4NTI4NzU3In0= Dockerfile_667f1a78ea6379.68528757' - - 'docker push webdevops/php-apache-dev:8.1-alpine' - - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.1-alpine' -'webdevops/php:8.3-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.3-alpine' - - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_667f1a78ea8b41.81742789' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8b41.81742789' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOGI0MS44MTc0Mjc4OSJ9 Dockerfile_667f1a78ea8b41.81742789' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.3-alpine' - - 'docker tag webdevops/php:8.3-alpine webdevops/php-official:8.3-alpine' - - 'docker push webdevops/php-official:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_667f1a78ea8e30.16387680' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8e30.16387680' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYThlMzAuMTYzODc2ODAifQ== Dockerfile_667f1a78ea8e30.16387680' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.3-alpine' - - 'docker tag webdevops/php-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-nginx:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_667f1a78ea90c7.39536377' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea90c7.39536377' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOTBjNy4zOTUzNjM3NyJ9 Dockerfile_667f1a78ea90c7.39536377' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.3-alpine' - - 'docker tag webdevops/php-nginx:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-nginx-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_667f1a78ea9382.50928096' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9382.50928096' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTkzODIuNTA5MjgwOTYifQ== Dockerfile_667f1a78ea9382.50928096' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.3-alpine' -'webdevops/php-apache:8.3-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_667f1a78ea9618.83273110' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9618.83273110' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTk2MTguODMyNzMxMTAifQ== Dockerfile_667f1a78ea9618.83273110' - - 'docker push webdevops/php-apache:8.3-alpine' - - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.3-alpine' -'webdevops/php-apache-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_667f1a78ea98a5.83179491' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea98a5.83179491' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5OGE1LjgzMTc5NDkxIn0= Dockerfile_667f1a78ea98a5.83179491' - - 'docker push webdevops/php-apache-dev:8.3-alpine' - - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.3-alpine' -'webdevops/php:8.1': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.1' - - 'docker build --no-cache -t webdevops/php:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_667f1a78ea9b24.63300881' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9b24.63300881' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5YjI0LjYzMzAwODgxIn0= Dockerfile_667f1a78ea9b24.63300881' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - - 'docker push webdevops/php:8.1' - - 'docker tag webdevops/php:8.1 $CI_REGISTRY_IMAGE/php:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php:8.1' - - 'docker tag webdevops/php:8.1 webdevops/php-official:8.1' - - 'docker push webdevops/php-official:8.1' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.1' - - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_667f1a78ea9e21.36207680' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9e21.36207680' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOWUyMS4zNjIwNzY4MCJ9 Dockerfile_667f1a78ea9e21.36207680' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.1' - - 'docker tag webdevops/php-dev:8.1 $CI_REGISTRY_IMAGE/php-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-nginx:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.1' - - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_667f1a78eaa153.04305152' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa153.04305152' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWFhMTUzLjA0MzA1MTUyIn0= Dockerfile_667f1a78eaa153.04305152' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.1' - - 'docker tag webdevops/php-nginx:8.1 $CI_REGISTRY_IMAGE/php-nginx:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-nginx-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.1' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_667f1a78eaa4e0.42729575' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa4e0.42729575' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTRlMC40MjcyOTU3NSJ9 Dockerfile_667f1a78eaa4e0.42729575' - - 'docker push webdevops/php-nginx-dev:8.1' - - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.1' -'webdevops/php-apache:8.1': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.1' - - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_667f1a78eaa807.54530156' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa807.54530156' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTgwNy41NDUzMDE1NiJ9 Dockerfile_667f1a78eaa807.54530156' - - 'docker push webdevops/php-apache:8.1' - - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' - tags: - - aws - needs: - - 'webdevops/php:8.1' -'webdevops/php-apache-dev:8.1': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.1' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_667f1a78eaac02.87762131' - - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaac02.87762131' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYWFjMDIuODc3NjIxMzEifQ== Dockerfile_667f1a78eaac02.87762131' - - 'docker push webdevops/php-apache-dev:8.1' - - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - tags: - - aws - needs: - - 'webdevops/php-apache:8.1' diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index f4f57bb32..9217b0869 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -83,7 +83,7 @@ {%- endif %} && docker-php-ext-install \ bcmath \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} amqp \ {%- endif %} {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} @@ -298,7 +298,7 @@ ffi \ imagick \ {%- endif %} -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} amqp \ {%- endif %} intl \ From 54ac4e4f6367da237d59ceda1c7cfe9d95288db5 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 20 Jan 2026 13:09:36 +0100 Subject: [PATCH 56/63] =?UTF-8?q?=F0=9F=90=9B=20fix=20condition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 432 +++++++++++++++++------------------ ci/src/GithubJobBuilder.php | 6 +- 2 files changed, 219 insertions(+), 219 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a88f28dda..bdfc3b838 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -31,7 +31,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -54,7 +54,7 @@ jobs: bundle install bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -76,7 +76,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -84,7 +84,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -112,7 +112,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -134,7 +134,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -142,7 +142,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -170,7 +170,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -192,7 +192,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -200,7 +200,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -228,7 +228,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -250,7 +250,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -258,7 +258,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -286,7 +286,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -308,7 +308,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -316,7 +316,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -344,7 +344,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -366,7 +366,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -374,7 +374,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -402,7 +402,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -424,7 +424,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -432,7 +432,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -447,7 +447,7 @@ jobs: tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' platforms: linux/amd64 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -469,7 +469,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -477,7 +477,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -500,7 +500,7 @@ jobs: bundle install bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -522,7 +522,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -530,7 +530,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -553,7 +553,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -575,7 +575,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -583,7 +583,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -606,7 +606,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -628,7 +628,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -636,7 +636,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -659,7 +659,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -681,7 +681,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -689,7 +689,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -712,7 +712,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -734,7 +734,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -742,7 +742,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -765,7 +765,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -787,7 +787,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -795,7 +795,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -818,7 +818,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -840,7 +840,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -848,7 +848,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -871,7 +871,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -893,7 +893,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -901,7 +901,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -924,7 +924,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -946,7 +946,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -954,7 +954,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -977,7 +977,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -999,7 +999,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1007,7 +1007,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1030,7 +1030,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1052,7 +1052,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1060,7 +1060,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1083,7 +1083,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1105,7 +1105,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1113,7 +1113,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1136,7 +1136,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1158,7 +1158,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1166,7 +1166,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1189,7 +1189,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1211,7 +1211,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1219,7 +1219,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1242,7 +1242,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1264,7 +1264,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1272,7 +1272,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1295,7 +1295,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1317,7 +1317,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1325,7 +1325,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1348,7 +1348,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1370,7 +1370,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1378,7 +1378,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1401,7 +1401,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1423,7 +1423,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1431,7 +1431,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1454,7 +1454,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1476,7 +1476,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1484,7 +1484,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1507,7 +1507,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1529,7 +1529,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1537,7 +1537,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1560,7 +1560,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1582,7 +1582,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1590,7 +1590,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1618,7 +1618,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1640,7 +1640,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1648,7 +1648,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1676,7 +1676,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1698,7 +1698,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1706,7 +1706,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1734,7 +1734,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1756,7 +1756,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1764,7 +1764,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1792,7 +1792,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1814,7 +1814,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1822,7 +1822,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1850,7 +1850,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1872,7 +1872,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1880,7 +1880,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1908,7 +1908,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1930,7 +1930,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1938,7 +1938,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -1966,7 +1966,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -1988,7 +1988,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1996,7 +1996,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2024,7 +2024,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2046,7 +2046,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2054,7 +2054,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2082,7 +2082,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2104,7 +2104,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2112,7 +2112,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2140,7 +2140,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2162,7 +2162,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2170,7 +2170,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2193,7 +2193,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2215,7 +2215,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2223,7 +2223,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2246,7 +2246,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2268,7 +2268,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2276,7 +2276,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2299,7 +2299,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2321,7 +2321,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2329,7 +2329,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2352,7 +2352,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2374,7 +2374,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2382,7 +2382,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2405,7 +2405,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2427,7 +2427,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2435,7 +2435,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2458,7 +2458,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2480,7 +2480,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2488,7 +2488,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2511,7 +2511,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2533,7 +2533,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2541,7 +2541,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2564,7 +2564,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2586,7 +2586,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2594,7 +2594,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2617,7 +2617,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2639,7 +2639,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2647,7 +2647,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2670,7 +2670,7 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2692,7 +2692,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2700,7 +2700,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2728,7 +2728,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2750,7 +2750,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2758,7 +2758,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2786,7 +2786,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2808,7 +2808,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2816,7 +2816,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2844,7 +2844,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2866,7 +2866,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2874,7 +2874,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2902,7 +2902,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2924,7 +2924,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2932,7 +2932,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -2960,7 +2960,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -2982,7 +2982,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2990,7 +2990,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3018,7 +3018,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3040,7 +3040,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3048,7 +3048,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3076,7 +3076,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3098,7 +3098,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3106,7 +3106,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3134,7 +3134,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3156,7 +3156,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3164,7 +3164,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3192,7 +3192,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3214,7 +3214,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3222,7 +3222,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3250,7 +3250,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3272,7 +3272,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3280,7 +3280,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3308,7 +3308,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3330,7 +3330,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3338,7 +3338,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3366,7 +3366,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3388,7 +3388,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3396,7 +3396,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3424,7 +3424,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3446,7 +3446,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3454,7 +3454,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3482,7 +3482,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3504,7 +3504,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3512,7 +3512,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3540,7 +3540,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3562,7 +3562,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3570,7 +3570,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3598,7 +3598,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3620,7 +3620,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3628,7 +3628,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3656,7 +3656,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3678,7 +3678,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3686,7 +3686,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3714,7 +3714,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3736,7 +3736,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3744,7 +3744,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3772,7 +3772,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3794,7 +3794,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3802,7 +3802,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3830,7 +3830,7 @@ jobs: cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3852,7 +3852,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3860,7 +3860,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3875,7 +3875,7 @@ jobs: tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' platforms: linux/amd64 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3895,7 +3895,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3903,7 +3903,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3918,7 +3918,7 @@ jobs: tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' platforms: linux/amd64 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: @@ -3940,7 +3940,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3948,7 +3948,7 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: @@ -3971,7 +3971,7 @@ jobs: bundle install bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - if: "github.ref == 'refs/heads/github-actions'" + if: "${{github.ref == 'refs/heads/master'}}" name: Push uses: docker/build-push-action@v6 with: diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index c1f07b7cd..81cc5c1d3 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -28,7 +28,7 @@ public function getJobDescription(array $node): array ['uses' => 'docker/setup-qemu-action@v3'], ['uses' => 'docker/setup-buildx-action@v3'], [ - 'if' => "github.ref == 'refs/heads/master'", + 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Login to ghcr.io', 'uses' => 'docker/login-action@v3', 'with' => [ @@ -38,7 +38,7 @@ public function getJobDescription(array $node): array ], ], [ - 'if' => "github.ref == 'refs/heads/master'", + 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Login to hub.docker.com', 'uses' => 'docker/login-action@v3', 'with' => [ @@ -65,7 +65,7 @@ public function getJobDescription(array $node): array 'run' => implode("\n", $structuredTests), ] : null, [ - 'if' => "github.ref == 'refs/heads/master'", + 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Push', // 'name' => 'Build ARM + Push', 'uses' => 'docker/build-push-action@v6', From 4f3c19b4f8834051ff22a31e19c086bdf9c16d63 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 20 Jan 2026 13:42:07 +0100 Subject: [PATCH 57/63] =?UTF-8?q?=E2=9E=95=20add=20validate-automation=20j?= =?UTF-8?q?ob=20to=20actions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 2327 ++++++++++++++--------------- ci/src/Commands/GithubCommand.php | 6 +- ci/src/GithubJobBuilder.php | 77 +- 3 files changed, 1155 insertions(+), 1255 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bdfc3b838..6fbd79660 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,6 +9,23 @@ name: build - master workflow_dispatch: null jobs: + validate-automation: + name: 'Validate Automation' + runs-on: ubuntu-latest + steps: + - + uses: actions/checkout@v4 + - + name: 'Validate that template/* are used to generate Dockerfiles' + run: |- + docker run --rm -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision + git diff --exit-code --color=always + - + name: 'Validate .github/workflows/build.yaml is up to date' + run: |- + docker run --rm -v $PWD:/app -w /app/ci webdevops/php:8.4-alpine composer install + docker run --rm -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console github:generate-ci + git diff --exit-code --color=always apache_alpine: name: 'webdevops/apache:alpine' needs: @@ -18,25 +35,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -53,6 +53,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -71,25 +86,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -111,6 +109,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -129,25 +142,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -169,6 +165,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -187,25 +198,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -227,6 +221,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -245,25 +254,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -285,6 +277,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -303,25 +310,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -343,6 +333,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -361,25 +366,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -401,6 +389,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -419,10 +422,16 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/dockerfile-build-env/latest + load: true + tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' + platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -438,14 +447,6 @@ jobs: with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Build x64' - uses: docker/build-push-action@v6 - with: - context: docker/dockerfile-build-env/latest - load: true - tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' - platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -464,33 +465,16 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 + name: 'Build x64' + uses: docker/build-push-action@v6 with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Build x64' - uses: docker/build-push-action@v6 - with: - context: docker/nginx/alpine - load: true - tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' - platforms: linux/amd64 + context: docker/nginx/alpine + load: true + tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' + platforms: linux/amd64 - name: 'run serverspec' run: |- @@ -499,6 +483,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -517,25 +516,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -552,6 +534,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -570,25 +567,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -605,6 +585,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -623,25 +618,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -658,6 +636,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -676,25 +669,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -711,6 +687,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -729,25 +720,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -764,6 +738,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -782,25 +771,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -817,6 +789,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -835,25 +822,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -870,6 +840,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -888,25 +873,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -923,6 +891,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -941,25 +924,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -976,6 +942,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -994,25 +975,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1029,6 +993,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1047,25 +1026,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1082,6 +1044,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1100,25 +1077,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1135,6 +1095,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1153,25 +1128,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1188,28 +1146,6 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' - platforms: linux/amd64 - php-apache_8-2-alpine: - name: 'webdevops/php-apache:8.2-alpine' - needs: - - php_8-2-alpine - runs-on: ubuntu-latest - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - - - uses: docker/setup-buildx-action@v3 - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1225,6 +1161,26 @@ jobs: with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-apache/8.2 + push: true + tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' + platforms: linux/amd64 + php-apache_8-2-alpine: + name: 'webdevops/php-apache:8.2-alpine' + needs: + - php_8-2-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-buildx-action@v3 - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1241,6 +1197,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1259,25 +1230,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1294,6 +1248,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1312,25 +1281,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1347,6 +1299,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1365,25 +1332,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1400,6 +1350,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1418,25 +1383,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1453,6 +1401,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1471,25 +1434,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1506,6 +1452,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1524,25 +1485,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1559,6 +1503,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1577,25 +1536,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1617,6 +1559,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1634,26 +1591,9 @@ jobs: container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - - - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' + uses: actions/checkout@v4 + - + uses: docker/setup-buildx-action@v3 - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1675,6 +1615,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1693,25 +1648,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1733,6 +1671,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1751,25 +1704,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1791,6 +1727,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1809,25 +1760,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1849,6 +1783,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1867,25 +1816,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1907,6 +1839,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1925,25 +1872,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -1965,6 +1895,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -1983,25 +1928,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2023,6 +1951,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2041,25 +1984,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2081,28 +2007,6 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.5 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' - platforms: linux/amd64 - php-dev_8-5-alpine: - name: 'webdevops/php-dev:8.5-alpine' - needs: - - php_8-5-alpine - runs-on: ubuntu-latest - container: webdevops/dockerfile-build-env - steps: - - - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - - - uses: docker/setup-buildx-action@v3 - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2118,6 +2022,26 @@ jobs: with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: Push + uses: docker/build-push-action@v6 + with: + context: docker/php-dev/8.5 + push: true + tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' + platforms: linux/amd64 + php-dev_8-5-alpine: + name: 'webdevops/php-dev:8.5-alpine' + needs: + - php_8-5-alpine + runs-on: ubuntu-latest + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v4 + - + uses: docker/setup-buildx-action@v3 - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2139,6 +2063,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2157,25 +2096,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2192,6 +2114,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2210,25 +2147,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2245,6 +2165,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2263,25 +2198,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2298,6 +2216,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2316,25 +2249,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2351,6 +2267,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2369,25 +2300,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2404,6 +2318,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2422,25 +2351,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2457,6 +2369,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2475,25 +2402,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2510,6 +2420,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2528,25 +2453,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2563,6 +2471,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2581,25 +2504,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2616,6 +2522,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2634,25 +2555,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2669,6 +2573,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2687,25 +2606,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2727,6 +2629,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2745,25 +2662,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2785,6 +2685,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2803,25 +2718,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2843,6 +2741,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2861,25 +2774,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2901,6 +2797,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2919,25 +2830,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -2959,6 +2853,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -2977,25 +2886,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3013,10 +2905,25 @@ jobs: bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3035,25 +2942,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3075,6 +2965,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3093,25 +2998,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3133,6 +3021,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3151,25 +3054,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3191,6 +3077,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3209,25 +3110,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3249,6 +3133,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3267,25 +3166,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3307,6 +3189,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3325,25 +3222,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3365,6 +3245,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3383,25 +3278,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3423,6 +3301,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3441,25 +3334,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3481,6 +3357,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3499,25 +3390,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3539,6 +3413,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3557,25 +3446,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3597,6 +3469,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3615,25 +3502,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3655,6 +3525,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3673,25 +3558,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3713,6 +3581,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3731,25 +3614,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3771,6 +3637,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3789,25 +3670,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3829,6 +3693,21 @@ jobs: run: |- cd tests/structure-test /usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3847,10 +3726,16 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/storage/latest + load: true + tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' + platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3866,14 +3751,6 @@ jobs: with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Build x64' - uses: docker/build-push-action@v6 - with: - context: docker/storage/latest - load: true - tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' - platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3885,15 +3762,23 @@ jobs: platforms: linux/amd64 toolbox_latest: name: 'webdevops/toolbox:latest' + needs: + - validate-automation runs-on: ubuntu-latest container: webdevops/dockerfile-build-env steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 + - + name: 'Build x64' + uses: docker/build-push-action@v6 + with: + context: docker/toolbox/latest + load: true + tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' + platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3909,14 +3794,6 @@ jobs: with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - name: 'Build x64' - uses: docker/build-push-action@v6 - with: - context: docker/toolbox/latest - load: true - tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' - platforms: linux/amd64 - if: "${{github.ref == 'refs/heads/master'}}" name: Push @@ -3935,25 +3812,8 @@ jobs: steps: - uses: actions/checkout@v4 - - - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to ghcr.io' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: '${{ github.actor }}' - password: '${{ secrets.GITHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - name: 'Build x64' uses: docker/build-push-action@v6 @@ -3970,6 +3830,21 @@ jobs: echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - if: "${{github.ref == 'refs/heads/master'}}" name: Push diff --git a/ci/src/Commands/GithubCommand.php b/ci/src/Commands/GithubCommand.php index 71f41ed8a..7b079a22b 100644 --- a/ci/src/Commands/GithubCommand.php +++ b/ci/src/Commands/GithubCommand.php @@ -13,7 +13,6 @@ use Webdevops\Build\GithubJobBuilder; use function ksort; -use function var_dump; class GithubCommand extends Command { @@ -50,6 +49,10 @@ protected function execute(InputInterface $input, OutputInterface $output) ksort($this->jobs); // system independent order of jobs + $this->jobs = [ + 'validate-automation' => $this->jobBuilder->getValidationConfig(), + ...$this->jobs, + ];; $buildYaml = [ 'name' => 'build', 'on' => [ @@ -115,5 +118,4 @@ private function buildTree(): Tree } return new Tree($data); } - } diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index 81cc5c1d3..65a404750 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -11,22 +11,38 @@ public function getJobDescription(array $node): array { $serverSpec = $this->serverSpec($node); $structuredTests = $this->structuredTests($node); - $job = []; - if ($node['parent'] ?? false) { - // put needs at the beginning - $job['needs'] = [GithubJobBuilder::toJobId($node['parent'])]; - } - $job = [ + + return [ 'name' => $node['name'], - ...$job, + 'needs' => [ + ($node['parent'] ?? null) ? GithubJobBuilder::toJobId($node['parent']) : 'validate-automation', + ], 'runs-on' => 'ubuntu-latest', 'container' => 'webdevops/dockerfile-build-env', 'steps' => array_values( array_filter( [ ['uses' => 'actions/checkout@v4'], - ['uses' => 'docker/setup-qemu-action@v3'], +// ['uses' => 'docker/setup-qemu-action@v3'], // only needed for ARM builds ['uses' => 'docker/setup-buildx-action@v3'], + [ + 'name' => 'Build x64', + 'uses' => 'docker/build-push-action@v6', + 'with' => [ + 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), + 'load' => true, + 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], + 'platforms' => 'linux/amd64', + ], + ], + $serverSpec ? [ + 'name' => 'run serverspec', + 'run' => implode("\n", $serverSpec), + ] : null, + $structuredTests ? [ + 'name' => 'run structure-test', + 'run' => implode("\n", $structuredTests), + ] : null, [ 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Login to ghcr.io', @@ -38,6 +54,7 @@ public function getJobDescription(array $node): array ], ], [ + // login after the build so the rate limit of github is used and not from our login Token. 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Login to hub.docker.com', 'uses' => 'docker/login-action@v3', @@ -46,24 +63,6 @@ public function getJobDescription(array $node): array 'password' => '${{ secrets.DOCKERHUB_TOKEN }}', ], ], - [ - 'name' => 'Build x64', - 'uses' => 'docker/build-push-action@v6', - 'with' => [ - 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), - 'load' => true, - 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], - 'platforms' => 'linux/amd64', - ], - ], - $serverSpec ? [ - 'name' => 'run serverspec', - 'run' => implode("\n", $serverSpec), - ] : null, - $structuredTests ? [ - 'name' => 'run structure-test', - 'run' => implode("\n", $structuredTests), - ] : null, [ 'if' => '${{github.ref == \'refs/heads/master\'}}', 'name' => 'Push', @@ -81,7 +80,6 @@ public function getJobDescription(array $node): array ), ), ]; - return $job; } public static function toJobId(string $name): string @@ -129,4 +127,29 @@ private function structuredTests(array $node): array return $script; } + public function getValidationConfig(): array + { + return [ + 'name' => 'Validate Automation', + 'runs-on' => 'ubuntu-latest', + 'steps' => [ + ['uses' => 'actions/checkout@v4'], + [ + 'name' => 'Validate that template/* are used to generate Dockerfiles', + 'run' => implode("\n", [ + 'docker run --rm -v $PWD:/app -w /app webdevops/dockerfile-build-env make provision', + 'git diff --exit-code --color=always', + ]), + ], + [ + 'name' => 'Validate .github/workflows/build.yaml is up to date', + 'run' => implode("\n", [ + 'docker run --rm -v $PWD:/app -w /app/ci webdevops/php:8.4-alpine composer install', + 'docker run --rm -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console github:generate-ci', + 'git diff --exit-code --color=always', + ]), + ], + ], + ]; + } } From 4334151319943f72d4f570f93889a32e75b27775 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 20 Jan 2026 14:25:25 +0100 Subject: [PATCH 58/63] =?UTF-8?q?=F0=9F=90=9B=20fix=20webdevops/dockerfile?= =?UTF-8?q?-build-env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/dockerfile-build-env/latest/Dockerfile | 3 ++- docker/dockerfile-build-env/latest/Dockerfile.jinja2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 52ad81edd..6e21b3a7f 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -32,8 +32,9 @@ RUN apt-install \ && hash -r pip \ && pip install --upgrade setuptools \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ + && gem install bundler -v 2.1.4 --no-document \ && cd /tmp/Dockerfile/tests/serverspec \ - && bundle update --bundler \ + && bundle _2.1.4_ update --bundler \ && cd /tmp/Dockerfile \ && make setup \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 index ec05066b9..b6ebd683f 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 +++ b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 @@ -27,8 +27,9 @@ RUN apt-install \ && hash -r pip \ && pip install --upgrade setuptools \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ + && gem install bundler -v 2.1.4 --no-document \ && cd /tmp/Dockerfile/tests/serverspec \ - && bundle update --bundler \ + && bundle _2.1.4_ update --bundler \ && cd /tmp/Dockerfile \ && make setup \ {{ docker.cleanup() }} From 896c5dc14abf8551755ee371cda191453416fcb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 14:34:04 +0000 Subject: [PATCH 59/63] build(deps): bump symfony/process from 6.4.8 to 6.4.14 in /ci Bumps [symfony/process](https://github.com/symfony/process) from 6.4.8 to 6.4.14. - [Release notes](https://github.com/symfony/process/releases) - [Changelog](https://github.com/symfony/process/blob/8.1/CHANGELOG.md) - [Commits](https://github.com/symfony/process/compare/v6.4.8...v6.4.14) --- updated-dependencies: - dependency-name: symfony/process dependency-version: 6.4.14 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ci/composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/composer.lock b/ci/composer.lock index 576a5aeef..0541b06f3 100644 --- a/ci/composer.lock +++ b/ci/composer.lock @@ -589,16 +589,16 @@ }, { "name": "symfony/process", - "version": "v6.4.8", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" + "reference": "25214adbb0996d18112548de20c281be9f27279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", + "reference": "25214adbb0996d18112548de20c281be9f27279f", "shasum": "" }, "require": { @@ -630,7 +630,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v6.4.14" }, "funding": [ { @@ -646,7 +646,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-11-06T09:25:01+00:00" }, { "name": "symfony/service-contracts", @@ -894,10 +894,10 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } From a6843b642dd8e9e90045f7c55de792982500b987 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Sat, 24 Jan 2026 11:51:31 +0100 Subject: [PATCH 60/63] =?UTF-8?q?=E2=9C=A8=20add=20ARM=20into=20build=20pi?= =?UTF-8?q?peline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 5612 ++++++++++++----- build-local.sh | 42 +- ci/src/Commands/GithubCommand.php | 6 +- ci/src/GithubJobBuilder.php | 194 +- docker/dockerfile-build-env/latest/Dockerfile | 11 +- .../latest/Dockerfile.jinja2 | 11 +- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0/Dockerfile | 2 +- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2/Dockerfile | 2 +- docker/php-official/8.3/Dockerfile | 2 +- docker/php-official/8.4-alpine/Dockerfile | 2 +- docker/php-official/8.4/Dockerfile | 2 +- docker/php-official/8.5/Dockerfile | 2 +- 19 files changed, 4327 insertions(+), 1575 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6fbd79660..fc6dcc97a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: 'Validate that template/* are used to generate Dockerfiles' run: |- @@ -27,29 +27,44 @@ jobs: docker run --rm -v $PWD:/app -w /app webdevops/php:8.4-alpine ci/console github:generate-ci git diff --exit-code --color=always apache_alpine: - name: 'webdevops/apache:alpine' - needs: - - base_alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/apache:alpine (${{ matrix.arch }})' + needs: base_alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/apache/alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/apache:alpine,webdevops/apache:alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/apache:sha-${{ github.sha }}-${{ matrix.arch }}-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/apache:alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/apache:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -62,45 +77,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/apache:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine' + apache_alpine_publish: + name: 'webdevops/apache:alpine - Publish' + runs-on: ubuntu-latest + needs: apache_alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/apache/alpine - push: true - tags: 'ghcr.io/webdevops/apache:alpine,webdevops/apache:alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/apache:alpine" \ + -t "ghcr.io/webdevops/apache:alpine" \ + "ghcr.io/webdevops/apache:sha-${{ github.sha }}-amd64-alpine" \ + "ghcr.io/webdevops/apache:sha-${{ github.sha }}-arm64-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 base-app_alpine: - name: 'webdevops/base-app:alpine' - needs: - - base_alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/base-app:alpine (${{ matrix.arch }})' + needs: base_alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/base-app/alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/base-app:alpine,webdevops/base-app:alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/base-app:alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -108,7 +160,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-alpine --config base-app/test.yaml --config base-app/alpine/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -118,45 +170,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine' + base-app_alpine_publish: + name: 'webdevops/base-app:alpine - Publish' + runs-on: ubuntu-latest + needs: base-app_alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/base-app/alpine - push: true - tags: 'ghcr.io/webdevops/base-app:alpine,webdevops/base-app:alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/base-app:alpine" \ + -t "ghcr.io/webdevops/base-app:alpine" \ + "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-amd64-alpine" \ + "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-arm64-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 base-app_ubuntu-22-04: - name: 'webdevops/base-app:ubuntu-22.04' - needs: - - base_ubuntu-22-04 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/base-app:ubuntu-22.04 (${{ matrix.arch }})' + needs: base_ubuntu-22-04_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/base-app/ubuntu-22.04 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/base-app:ubuntu-22.04,webdevops/base-app:ubuntu-22.04' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -164,7 +253,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04 --config base-app/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -174,45 +263,84 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04' + base-app_ubuntu-22-04_publish: + name: 'webdevops/base-app:ubuntu-22.04 - Publish' + runs-on: ubuntu-latest + needs: base-app_ubuntu-22-04 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/base-app/ubuntu-22.04 - push: true - tags: 'ghcr.io/webdevops/base-app:ubuntu-22.04,webdevops/base-app:ubuntu-22.04' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/base-app:ubuntu-22.04" \ + -t "ghcr.io/webdevops/base-app:ubuntu-22.04" \ + -t "webdevops/base-app:latest" \ + -t "ghcr.io/webdevops/base-app:latest" \ + "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-amd64-ubuntu-22.04" \ + "ghcr.io/webdevops/base-app:sha-${{ github.sha }}-arm64-ubuntu-22.04" && exit 0 + sleep $((i*i)) + done + exit 1 base_alpine: - name: 'webdevops/base:alpine' - needs: - - bootstrap_alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/base:alpine (${{ matrix.arch }})' + needs: bootstrap_alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/base/alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/base:alpine,webdevops/base:alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/base:alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -220,7 +348,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-alpine --config base/test.yaml --config base/alpine/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -230,45 +358,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine' + base_alpine_publish: + name: 'webdevops/base:alpine - Publish' + runs-on: ubuntu-latest + needs: base_alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/base/alpine - push: true - tags: 'ghcr.io/webdevops/base:alpine,webdevops/base:alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/base:alpine" \ + -t "ghcr.io/webdevops/base:alpine" \ + "ghcr.io/webdevops/base:sha-${{ github.sha }}-amd64-alpine" \ + "ghcr.io/webdevops/base:sha-${{ github.sha }}-arm64-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 base_ubuntu-22-04: - name: 'webdevops/base:ubuntu-22.04' - needs: - - bootstrap_ubuntu-22-04 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/base:ubuntu-22.04 (${{ matrix.arch }})' + needs: bootstrap_ubuntu-22-04_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/base/ubuntu-22.04 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/base:ubuntu-22.04,webdevops/base:ubuntu-22.04' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -276,7 +441,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04 --config base/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -286,45 +451,84 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04' + base_ubuntu-22-04_publish: + name: 'webdevops/base:ubuntu-22.04 - Publish' + runs-on: ubuntu-latest + needs: base_ubuntu-22-04 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/base/ubuntu-22.04 - push: true - tags: 'ghcr.io/webdevops/base:ubuntu-22.04,webdevops/base:ubuntu-22.04' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/base:ubuntu-22.04" \ + -t "ghcr.io/webdevops/base:ubuntu-22.04" \ + -t "webdevops/base:latest" \ + -t "ghcr.io/webdevops/base:latest" \ + "ghcr.io/webdevops/base:sha-${{ github.sha }}-amd64-ubuntu-22.04" \ + "ghcr.io/webdevops/base:sha-${{ github.sha }}-arm64-ubuntu-22.04" && exit 0 + sleep $((i*i)) + done + exit 1 bootstrap_alpine: - name: 'webdevops/bootstrap:alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/bootstrap:alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/bootstrap/alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/bootstrap:alpine,webdevops/bootstrap:alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -332,7 +536,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -342,45 +546,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine' + bootstrap_alpine_publish: + name: 'webdevops/bootstrap:alpine - Publish' + runs-on: ubuntu-latest + needs: bootstrap_alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/bootstrap/alpine - push: true - tags: 'ghcr.io/webdevops/bootstrap:alpine,webdevops/bootstrap:alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/bootstrap:alpine" \ + -t "ghcr.io/webdevops/bootstrap:alpine" \ + "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-amd64-alpine" \ + "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-arm64-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 bootstrap_ubuntu-22-04: - name: 'webdevops/bootstrap:ubuntu-22.04' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/bootstrap:ubuntu-22.04 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/bootstrap/ubuntu-22.04 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/bootstrap:ubuntu-22.04,webdevops/bootstrap:ubuntu-22.04' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -388,7 +629,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}-ubuntu-22.04 --config bootstrap/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -398,40 +639,79 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-${{ matrix.arch }}"-ubuntu-22.04' + bootstrap_ubuntu-22-04_publish: + name: 'webdevops/bootstrap:ubuntu-22.04 - Publish' + runs-on: ubuntu-latest + needs: bootstrap_ubuntu-22-04 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/bootstrap/ubuntu-22.04 - push: true - tags: 'ghcr.io/webdevops/bootstrap:ubuntu-22.04,webdevops/bootstrap:ubuntu-22.04' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/bootstrap:ubuntu-22.04" \ + -t "ghcr.io/webdevops/bootstrap:ubuntu-22.04" \ + -t "webdevops/bootstrap:latest" \ + -t "ghcr.io/webdevops/bootstrap:latest" \ + "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-amd64-ubuntu-22.04" \ + "ghcr.io/webdevops/bootstrap:sha-${{ github.sha }}-arm64-ubuntu-22.04" && exit 0 + sleep $((i*i)) + done + exit 1 dockerfile-build-env_latest: - name: 'webdevops/dockerfile-build-env:latest' - needs: - - base-app_ubuntu-22-04 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/dockerfile-build-env:latest (${{ matrix.arch }})' + needs: base-app_ubuntu-22-04_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/dockerfile-build-env/latest + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-${{ matrix.arch }}-latest' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -441,45 +721,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-${{ matrix.arch }}"-latest' + dockerfile-build-env_latest_publish: + name: 'webdevops/dockerfile-build-env:latest - Publish' + runs-on: ubuntu-latest + needs: dockerfile-build-env_latest + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/dockerfile-build-env/latest - push: true - tags: 'ghcr.io/webdevops/dockerfile-build-env:latest,webdevops/dockerfile-build-env:latest' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/dockerfile-build-env:latest" \ + -t "ghcr.io/webdevops/dockerfile-build-env:latest" \ + "ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-amd64-latest" \ + "ghcr.io/webdevops/dockerfile-build-env:sha-${{ github.sha }}-arm64-latest" && exit 0 + sleep $((i*i)) + done + exit 1 nginx_alpine: - name: 'webdevops/nginx:alpine' - needs: - - base_alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/nginx:alpine (${{ matrix.arch }})' + needs: base_alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/nginx/alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/nginx:sha-${{ github.sha }}-${{ matrix.arch }}-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/nginx:alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -492,45 +809,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-alpine' + nginx_alpine_publish: + name: 'webdevops/nginx:alpine - Publish' + runs-on: ubuntu-latest + needs: nginx_alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/nginx/alpine - push: true - tags: 'ghcr.io/webdevops/nginx:alpine,webdevops/nginx:alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/nginx:alpine" \ + -t "ghcr.io/webdevops/nginx:alpine" \ + "ghcr.io/webdevops/nginx:sha-${{ github.sha }}-amd64-alpine" \ + "ghcr.io/webdevops/nginx:sha-${{ github.sha }}-arm64-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache-dev_8-1: - name: 'webdevops/php-apache-dev:8.1' - needs: - - php-apache_8-1 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.1 (${{ matrix.arch }})' + needs: php-apache_8-1_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.1,webdevops/php-apache-dev:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -543,45 +897,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.1 - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.1,webdevops/php-apache-dev:8.1' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' php-apache-dev_8-1-alpine: - name: 'webdevops/php-apache-dev:8.1-alpine' - needs: - - php-apache_8-1-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.1-alpine (${{ matrix.arch }})' + needs: php-apache_8-1-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.1-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.1-alpine,webdevops/php-apache-dev:8.1-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -594,45 +951,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php-apache-dev_8-1-alpine_publish: + name: 'webdevops/php-apache-dev:8.1-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.1-alpine" \ + -t "ghcr.io/webdevops/php-apache-dev:8.1-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache-dev_8-1_publish: + name: 'webdevops/php-apache-dev:8.1 - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache-dev/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.1-alpine,webdevops/php-apache-dev:8.1-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.1" \ + -t "ghcr.io/webdevops/php-apache-dev:8.1" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache-dev_8-2: - name: 'webdevops/php-apache-dev:8.2' - needs: - - php-apache_8-2 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.2 (${{ matrix.arch }})' + needs: php-apache_8-2_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.2,webdevops/php-apache-dev:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -645,45 +1073,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.2 - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.2,webdevops/php-apache-dev:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php-apache-dev_8-2-alpine: - name: 'webdevops/php-apache-dev:8.2-alpine' - needs: - - php-apache_8-2-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.2-alpine (${{ matrix.arch }})' + needs: php-apache_8-2-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.2-alpine,webdevops/php-apache-dev:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -696,45 +1127,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php-apache-dev_8-2-alpine_publish: + name: 'webdevops/php-apache-dev:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.2-alpine" \ + -t "ghcr.io/webdevops/php-apache-dev:8.2-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache-dev_8-2_publish: + name: 'webdevops/php-apache-dev:8.2 - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-2 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache-dev/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.2-alpine,webdevops/php-apache-dev:8.2-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.2" \ + -t "ghcr.io/webdevops/php-apache-dev:8.2" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache-dev_8-3: - name: 'webdevops/php-apache-dev:8.3' - needs: - - php-apache_8-3 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.3 (${{ matrix.arch }})' + needs: php-apache_8-3_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.3,webdevops/php-apache-dev:8.3' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -747,45 +1249,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.3 - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.3,webdevops/php-apache-dev:8.3' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' php-apache-dev_8-3-alpine: - name: 'webdevops/php-apache-dev:8.3-alpine' - needs: - - php-apache_8-3-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.3-alpine (${{ matrix.arch }})' + needs: php-apache_8-3-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.3-alpine,webdevops/php-apache-dev:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -798,45 +1303,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php-apache-dev_8-3-alpine_publish: + name: 'webdevops/php-apache-dev:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.3-alpine" \ + -t "ghcr.io/webdevops/php-apache-dev:8.3-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache-dev_8-3_publish: + name: 'webdevops/php-apache-dev:8.3 - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache-dev/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.3-alpine,webdevops/php-apache-dev:8.3-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.3" \ + -t "ghcr.io/webdevops/php-apache-dev:8.3" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache-dev_8-4: - name: 'webdevops/php-apache-dev:8.4' - needs: - - php-apache_8-4 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.4 (${{ matrix.arch }})' + needs: php-apache_8-4_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.4 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.4,webdevops/php-apache-dev:8.4' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.4" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNCIsIkRPQ0tFUl9UQUciOiI4LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -849,45 +1425,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.4 - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.4,webdevops/php-apache-dev:8.4' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php-apache-dev_8-4-alpine: - name: 'webdevops/php-apache-dev:8.4-alpine' - needs: - - php-apache_8-4-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.4-alpine (${{ matrix.arch }})' + needs: php-apache_8-4-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.4-alpine,webdevops/php-apache-dev:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -900,45 +1479,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php-apache-dev_8-4-alpine_publish: + name: 'webdevops/php-apache-dev:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.4-alpine" \ + -t "ghcr.io/webdevops/php-apache-dev:8.4-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache-dev_8-4_publish: + name: 'webdevops/php-apache-dev:8.4 - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache-dev/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.4-alpine,webdevops/php-apache-dev:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.4" \ + -t "ghcr.io/webdevops/php-apache-dev:8.4" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache-dev_8-5: - name: 'webdevops/php-apache-dev:8.5' - needs: - - php-apache_8-5 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.5 (${{ matrix.arch }})' + needs: php-apache_8-5_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.5,webdevops/php-apache-dev:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNSIsIkRPQ0tFUl9UQUciOiI4LjUiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -951,45 +1601,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache-dev/8.5 - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.5,webdevops/php-apache-dev:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php-apache-dev_8-5-alpine: - name: 'webdevops/php-apache-dev:8.5-alpine' - needs: - - php-apache_8-5-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache-dev:8.5-alpine (${{ matrix.arch }})' + needs: php-apache_8-5-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache-dev/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.5-alpine,webdevops/php-apache-dev:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache-dev:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguNS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC41LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -1002,45 +1655,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-apache-dev_8-5-alpine_publish: + name: 'webdevops/php-apache-dev:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.5-alpine" \ + -t "ghcr.io/webdevops/php-apache-dev:8.5-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache-dev_8-5_publish: + name: 'webdevops/php-apache-dev:8.5 - Publish' + runs-on: ubuntu-latest + needs: php-apache-dev_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache-dev/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache-dev:8.5-alpine,webdevops/php-apache-dev:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache-dev:8.5" \ + -t "ghcr.io/webdevops/php-apache-dev:8.5" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-apache-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache_8-1: - name: 'webdevops/php-apache:8.1' - needs: - - php_8-1 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.1 (${{ matrix.arch }})' + needs: php_8-1_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.1,webdevops/php-apache:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1053,45 +1777,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.1 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.1,webdevops/php-apache:8.1' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' php-apache_8-1-alpine: - name: 'webdevops/php-apache:8.1-alpine' - needs: - - php_8-1-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.1-alpine (${{ matrix.arch }})' + needs: php_8-1-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.1-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.1-alpine,webdevops/php-apache:8.1-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1104,45 +1831,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php-apache_8-1-alpine_publish: + name: 'webdevops/php-apache:8.1-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.1-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.1-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-1_publish: + name: 'webdevops/php-apache:8.1 - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache:8.1-alpine,webdevops/php-apache:8.1-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.1" \ + -t "ghcr.io/webdevops/php-apache:8.1" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache_8-2: - name: 'webdevops/php-apache:8.2' - needs: - - php_8-2 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.2 (${{ matrix.arch }})' + needs: php_8-2_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1155,45 +1953,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.2 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.2,webdevops/php-apache:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php-apache_8-2-alpine: - name: 'webdevops/php-apache:8.2-alpine' - needs: - - php_8-2-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.2-alpine,webdevops/php-apache:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1206,45 +2007,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php-apache_8-2-alpine_publish: + name: 'webdevops/php-apache:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.2-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.2-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-2_publish: + name: 'webdevops/php-apache:8.2 - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-2 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache:8.2-alpine,webdevops/php-apache:8.2-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.2" \ + -t "ghcr.io/webdevops/php-apache:8.2" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache_8-3: - name: 'webdevops/php-apache:8.3' - needs: - - php_8-3 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.3 (${{ matrix.arch }})' + needs: php_8-3_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.3,webdevops/php-apache:8.3' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.3" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1257,45 +2129,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.3 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.3,webdevops/php-apache:8.3' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' php-apache_8-3-alpine: - name: 'webdevops/php-apache:8.3-alpine' - needs: - - php_8-3-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.3-alpine (${{ matrix.arch }})' + needs: php_8-3-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.3-alpine,webdevops/php-apache:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1308,50 +2183,52 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache:8.3-alpine,webdevops/php-apache:8.3-alpine' - platforms: linux/amd64 - php-apache_8-4: - name: 'webdevops/php-apache:8.4' - needs: - - php_8-4 + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php-apache_8-3-alpine_publish: + name: 'webdevops/php-apache:8.3-alpine - Publish' runs-on: ubuntu-latest - container: webdevops/dockerfile-build-env + needs: php-apache_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" steps: - - - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' - uses: docker/build-push-action@v6 + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache/8.4 - load: true - tags: 'ghcr.io/webdevops/php-apache:8.4,webdevops/php-apache:8.4' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' - - name: 'run serverspec' + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' run: |- - cd tests/serverspec - echo "FROM webdevops/php-apache:8.4" >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.3-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.3-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-3_publish: + name: 'webdevops/php-apache:8.3 - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1359,45 +2236,117 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.3" \ + -t "ghcr.io/webdevops/php-apache:8.3" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-4: + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.4 (${{ matrix.arch }})' + needs: php_8-4_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v6 + - + uses: docker/setup-buildx-action@v3 + - + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.4 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.4,webdevops/php-apache:8.4' - platforms: linux/amd64 + platforms: '${{ matrix.platform }}' + load: true + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php-apache_8-4-alpine: - name: 'webdevops/php-apache:8.4-alpine' - needs: - - php_8-4-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.4-alpine (${{ matrix.arch }})' + needs: php_8-4-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.4-alpine,webdevops/php-apache:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1410,45 +2359,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php-apache_8-4-alpine_publish: + name: 'webdevops/php-apache:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.4-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.4-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-4_publish: + name: 'webdevops/php-apache:8.4 - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache:8.4-alpine,webdevops/php-apache:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.4" \ + -t "ghcr.io/webdevops/php-apache:8.4" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php-apache_8-5: - name: 'webdevops/php-apache:8.5' - needs: - - php_8-5 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.5 (${{ matrix.arch }})' + needs: php_8-5_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.5,webdevops/php-apache:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1461,45 +2481,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-apache/8.5 - push: true - tags: 'ghcr.io/webdevops/php-apache:8.5,webdevops/php-apache:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php-apache_8-5-alpine: - name: 'webdevops/php-apache:8.5-alpine' - needs: - - php_8-5-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-apache:8.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-apache/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-apache:8.5-alpine,webdevops/php-apache:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-apache:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1512,45 +2535,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-apache_8-5-alpine_publish: + name: 'webdevops/php-apache:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.5-alpine" \ + -t "ghcr.io/webdevops/php-apache:8.5-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-apache_8-5_publish: + name: 'webdevops/php-apache:8.5 - Publish' + runs-on: ubuntu-latest + needs: php-apache_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-apache/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php-apache:8.5-alpine,webdevops/php-apache:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-apache:8.5" \ + -t "ghcr.io/webdevops/php-apache:8.5" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-apache:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 php-dev_8-1: - name: 'webdevops/php-dev:8.1' - needs: - - php_8-1 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.1 (${{ matrix.arch }})' + needs: php_8-1_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.1,webdevops/php-dev:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1558,7 +2652,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1568,45 +2662,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.1 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.1,webdevops/php-dev:8.1' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' php-dev_8-1-alpine: - name: 'webdevops/php-dev:8.1-alpine' - needs: - - php_8-1-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.1-alpine (${{ matrix.arch }})' + needs: php_8-1-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.1-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.1-alpine,webdevops/php-dev:8.1-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1614,7 +2711,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1624,45 +2721,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php-dev_8-1-alpine_publish: + name: 'webdevops/php-dev:8.1-alpine - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.1-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.1-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-1_publish: + name: 'webdevops/php-dev:8.1 - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-dev/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php-dev:8.1-alpine,webdevops/php-dev:8.1-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.1" \ + -t "ghcr.io/webdevops/php-dev:8.1" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php-dev_8-2: - name: 'webdevops/php-dev:8.2' - needs: - - php_8-2 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.2 (${{ matrix.arch }})' + needs: php_8-2_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.2,webdevops/php-dev:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -1670,7 +2838,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2 --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1680,45 +2848,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.2 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.2,webdevops/php-dev:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php-dev_8-2-alpine: - name: 'webdevops/php-dev:8.2-alpine' - needs: - - php_8-2-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.2-alpine,webdevops/php-dev:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1726,7 +2897,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1736,55 +2907,52 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php-dev_8-2-alpine_publish: + name: 'webdevops/php-dev:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php-dev:8.2-alpine,webdevops/php-dev:8.2-alpine' - platforms: linux/amd64 - php-dev_8-3: - name: 'webdevops/php-dev:8.3' - needs: - - php_8-3 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.2-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.2-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-2_publish: + name: 'webdevops/php-dev:8.2 - Publish' runs-on: ubuntu-latest - container: webdevops/dockerfile-build-env + needs: php-dev_8-2 + if: "${{github.ref == 'refs/heads/master'}}" steps: - - - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.3 - load: true - tags: 'ghcr.io/webdevops/php-dev:8.3,webdevops/php-dev:8.3' - platforms: linux/amd64 - - - name: 'run serverspec' - run: |- - cd tests/serverspec - echo "FROM webdevops/php-dev:8.3" >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml - - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -1792,53 +2960,71 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.3 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.3,webdevops/php-dev:8.3' - platforms: linux/amd64 - php-dev_8-3-alpine: - name: 'webdevops/php-dev:8.3-alpine' - needs: - - php_8-3-alpine - runs-on: ubuntu-latest + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.2" \ + -t "ghcr.io/webdevops/php-dev:8.2" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-3: + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.3 (${{ matrix.arch }})' + needs: php_8-3_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: - context: docker/php-dev/8.3-alpine + context: docker/php-dev/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.3-alpine,webdevops/php-dev:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test - name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3 --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1848,53 +3034,56 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php-dev:8.3-alpine,webdevops/php-dev:8.3-alpine' - platforms: linux/amd64 - php-dev_8-4: - name: 'webdevops/php-dev:8.4' - needs: - - php_8-4 - runs-on: ubuntu-latest + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' + php-dev_8-3-alpine: + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.3-alpine (${{ matrix.arch }})' + needs: php_8-3-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: - context: docker/php-dev/8.4 + context: docker/php-dev/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.4,webdevops/php-dev:8.4' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.4" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install - bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test - name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4 --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1904,45 +3093,175 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php-dev_8-3-alpine_publish: + name: 'webdevops/php-dev:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.3-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.3-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-3_publish: + name: 'webdevops/php-dev:8.3 - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.3" \ + -t "ghcr.io/webdevops/php-dev:8.3" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-4: + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.4 (${{ matrix.arch }})' + needs: php_8-4_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v6 + - + uses: docker/setup-buildx-action@v3 + - + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.4 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.4,webdevops/php-dev:8.4' - platforms: linux/amd64 + platforms: '${{ matrix.platform }}' + load: true + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4 --config php-dev/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php-dev_8-4-alpine: - name: 'webdevops/php-dev:8.4-alpine' - needs: - - php_8-4-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.4-alpine (${{ matrix.arch }})' + needs: php_8-4-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.4-alpine,webdevops/php-dev:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -1950,7 +3269,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.4-alpine --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -1960,45 +3279,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php-dev_8-4-alpine_publish: + name: 'webdevops/php-dev:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.4-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.4-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-4_publish: + name: 'webdevops/php-dev:8.4 - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-dev/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php-dev:8.4-alpine,webdevops/php-dev:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.4" \ + -t "ghcr.io/webdevops/php-dev:8.4" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php-dev_8-5: - name: 'webdevops/php-dev:8.5' - needs: - - php_8-5 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.5 (${{ matrix.arch }})' + needs: php_8-5_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2006,7 +3396,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5 --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5 --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2016,45 +3406,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-dev/8.5 - push: true - tags: 'ghcr.io/webdevops/php-dev:8.5,webdevops/php-dev:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php-dev_8-5-alpine: - name: 'webdevops/php-dev:8.5-alpine' - needs: - - php_8-5-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-dev:8.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-dev/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-dev:8.5-alpine,webdevops/php-dev:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-dev:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2062,7 +3455,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-dev:8.5-alpine --config php-dev/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine --config php-dev/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2072,45 +3465,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-dev_8-5-alpine_publish: + name: 'webdevops/php-dev:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.5-alpine" \ + -t "ghcr.io/webdevops/php-dev:8.5-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-dev_8-5_publish: + name: 'webdevops/php-dev:8.5 - Publish' + runs-on: ubuntu-latest + needs: php-dev_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-dev/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php-dev:8.5-alpine,webdevops/php-dev:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-dev:8.5" \ + -t "ghcr.io/webdevops/php-dev:8.5" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx-dev_8-1: - name: 'webdevops/php-nginx-dev:8.1' - needs: - - php-nginx_8-1 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.1 (${{ matrix.arch }})' + needs: php-nginx_8-1_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.1,webdevops/php-nginx-dev:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2123,45 +3587,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.1 - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.1,webdevops/php-nginx-dev:8.1' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' php-nginx-dev_8-1-alpine: - name: 'webdevops/php-nginx-dev:8.1-alpine' - needs: - - php-nginx_8-1-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.1-alpine (${{ matrix.arch }})' + needs: php-nginx_8-1-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.1-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.1-alpine,webdevops/php-nginx-dev:8.1-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2174,45 +3641,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php-nginx-dev_8-1-alpine_publish: + name: 'webdevops/php-nginx-dev:8.1-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.1-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.1-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx-dev_8-1_publish: + name: 'webdevops/php-nginx-dev:8.1 - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx-dev/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.1-alpine,webdevops/php-nginx-dev:8.1-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.1" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.1" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx-dev_8-2: - name: 'webdevops/php-nginx-dev:8.2' - needs: - - php-nginx_8-2 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.2 (${{ matrix.arch }})' + needs: php-nginx_8-2_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.2,webdevops/php-nginx-dev:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2225,45 +3763,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.2 - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.2,webdevops/php-nginx-dev:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php-nginx-dev_8-2-alpine: - name: 'webdevops/php-nginx-dev:8.2-alpine' - needs: - - php-nginx_8-2-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.2-alpine (${{ matrix.arch }})' + needs: php-nginx_8-2-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.2-alpine,webdevops/php-nginx-dev:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2276,45 +3817,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php-nginx-dev_8-2-alpine_publish: + name: 'webdevops/php-nginx-dev:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.2-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.2-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx-dev_8-2_publish: + name: 'webdevops/php-nginx-dev:8.2 - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-2 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx-dev/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.2-alpine,webdevops/php-nginx-dev:8.2-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.2" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.2" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx-dev_8-3: - name: 'webdevops/php-nginx-dev:8.3' - needs: - - php-nginx_8-3 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.3 (${{ matrix.arch }})' + needs: php-nginx_8-3_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.3,webdevops/php-nginx-dev:8.3' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2327,45 +3939,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.3 - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.3,webdevops/php-nginx-dev:8.3' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' php-nginx-dev_8-3-alpine: - name: 'webdevops/php-nginx-dev:8.3-alpine' - needs: - - php-nginx_8-3-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.3-alpine (${{ matrix.arch }})' + needs: php-nginx_8-3-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.3-alpine,webdevops/php-nginx-dev:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2378,45 +3993,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php-nginx-dev_8-3-alpine_publish: + name: 'webdevops/php-nginx-dev:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.3-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.3-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx-dev_8-3_publish: + name: 'webdevops/php-nginx-dev:8.3 - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx-dev/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.3-alpine,webdevops/php-nginx-dev:8.3-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.3" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.3" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx-dev_8-4: - name: 'webdevops/php-nginx-dev:8.4' - needs: - - php-nginx_8-4 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.4 (${{ matrix.arch }})' + needs: php-nginx_8-4_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.4 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.4,webdevops/php-nginx-dev:8.4' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.4" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40IiwiRE9DS0VSX1RBRyI6IjguNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2429,45 +4115,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.4 - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.4,webdevops/php-nginx-dev:8.4' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php-nginx-dev_8-4-alpine: - name: 'webdevops/php-nginx-dev:8.4-alpine' - needs: - - php-nginx_8-4-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.4-alpine (${{ matrix.arch }})' + needs: php-nginx_8-4-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.4-alpine,webdevops/php-nginx-dev:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC40LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2480,45 +4169,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php-nginx-dev_8-4-alpine_publish: + name: 'webdevops/php-nginx-dev:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.4-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.4-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx-dev_8-4_publish: + name: 'webdevops/php-nginx-dev:8.4 - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx-dev/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.4-alpine,webdevops/php-nginx-dev:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.4" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.4" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx-dev_8-5: - name: 'webdevops/php-nginx-dev:8.5' - needs: - - php-nginx_8-5 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.5 (${{ matrix.arch }})' + needs: php-nginx_8-5_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.5,webdevops/php-nginx-dev:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41IiwiRE9DS0VSX1RBRyI6IjguNSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2531,45 +4291,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx-dev/8.5 - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.5,webdevops/php-nginx-dev:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php-nginx-dev_8-5-alpine: - name: 'webdevops/php-nginx-dev:8.5-alpine' - needs: - - php-nginx_8-5-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx-dev:8.5-alpine (${{ matrix.arch }})' + needs: php-nginx_8-5-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx-dev/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.5-alpine,webdevops/php-nginx-dev:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx-dev:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC41LWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjUtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 Dockerfile_test @@ -2582,45 +4345,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-nginx-dev_8-5-alpine_publish: + name: 'webdevops/php-nginx-dev:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.5-alpine" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.5-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx-dev_8-5_publish: + name: 'webdevops/php-nginx-dev:8.5 - Publish' + runs-on: ubuntu-latest + needs: php-nginx-dev_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx-dev/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx-dev:8.5-alpine,webdevops/php-nginx-dev:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx-dev:8.5" \ + -t "ghcr.io/webdevops/php-nginx-dev:8.5" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-nginx-dev:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx_8-1: - name: 'webdevops/php-nginx:8.1' - needs: - - php_8-1 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.1 (${{ matrix.arch }})' + needs: php_8-1_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.1,webdevops/php-nginx:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -2628,7 +4462,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2638,55 +4472,111 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' + php-nginx_8-1-alpine: + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.1-alpine (${{ matrix.arch }})' + needs: php_8-1-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' + container: webdevops/dockerfile-build-env + steps: + - + uses: actions/checkout@v6 + - + uses: docker/setup-buildx-action@v3 + - + name: 'Build (load locally)' + uses: docker/build-push-action@v6 with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' + context: docker/php-nginx/8.1-alpine + platforms: '${{ matrix.platform }}' + load: true + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.1 - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.1,webdevops/php-nginx:8.1' - platforms: linux/amd64 - php-nginx_8-1-alpine: - name: 'webdevops/php-nginx:8.1-alpine' - needs: - - php_8-1-alpine + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php-nginx_8-1-alpine_publish: + name: 'webdevops/php-nginx:8.1-alpine - Publish' runs-on: ubuntu-latest - container: webdevops/dockerfile-build-env + needs: php-nginx_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" steps: - - - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' - uses: docker/build-push-action@v6 + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.1-alpine - load: true - tags: 'ghcr.io/webdevops/php-nginx:8.1-alpine,webdevops/php-nginx:8.1-alpine' - platforms: linux/amd64 + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - - name: 'run serverspec' + name: 'Create and push multi-arch manifest' run: |- - cd tests/serverspec - echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.1-alpine" \ + -t "ghcr.io/webdevops/php-nginx:8.1-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx_8-1_publish: + name: 'webdevops/php-nginx:8.1 - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml + uses: docker/setup-buildx-action@v3 - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -2694,45 +4584,63 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.1-alpine,webdevops/php-nginx:8.1-alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.1" \ + -t "ghcr.io/webdevops/php-nginx:8.1" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx_8-2: - name: 'webdevops/php-nginx:8.2' - needs: - - php_8-2 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.2 (${{ matrix.arch }})' + needs: php_8-2_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.2,webdevops/php-nginx:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -2740,7 +4648,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2 --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2750,45 +4658,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.2 - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.2,webdevops/php-nginx:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php-nginx_8-2-alpine: - name: 'webdevops/php-nginx:8.2-alpine' - needs: - - php_8-2-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.2-alpine,webdevops/php-nginx:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2796,7 +4707,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2806,45 +4717,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php-nginx_8-2-alpine_publish: + name: 'webdevops/php-nginx:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.2-alpine" \ + -t "ghcr.io/webdevops/php-nginx:8.2-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx_8-2_publish: + name: 'webdevops/php-nginx:8.2 - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-2 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.2-alpine,webdevops/php-nginx:8.2-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.2" \ + -t "ghcr.io/webdevops/php-nginx:8.2" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx_8-3: - name: 'webdevops/php-nginx:8.3' - needs: - - php_8-3 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.3 (${{ matrix.arch }})' + needs: php_8-3_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.3,webdevops/php-nginx:8.3' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -2852,7 +4834,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3 --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2862,45 +4844,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.3 - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.3,webdevops/php-nginx:8.3' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' php-nginx_8-3-alpine: - name: 'webdevops/php-nginx:8.3-alpine' - needs: - - php_8-3-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.3-alpine (${{ matrix.arch }})' + needs: php_8-3-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.3-alpine,webdevops/php-nginx:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -2908,7 +4893,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2918,45 +4903,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php-nginx_8-3-alpine_publish: + name: 'webdevops/php-nginx:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.3-alpine" \ + -t "ghcr.io/webdevops/php-nginx:8.3-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx_8-3_publish: + name: 'webdevops/php-nginx:8.3 - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.3-alpine,webdevops/php-nginx:8.3-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.3" \ + -t "ghcr.io/webdevops/php-nginx:8.3" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx_8-4: - name: 'webdevops/php-nginx:8.4' - needs: - - php_8-4 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.4 (${{ matrix.arch }})' + needs: php_8-4_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.4 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.4,webdevops/php-nginx:8.4' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.4" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -2964,7 +5020,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4 --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4 --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -2974,45 +5030,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.4 - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.4,webdevops/php-nginx:8.4' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php-nginx_8-4-alpine: - name: 'webdevops/php-nginx:8.4-alpine' - needs: - - php_8-4-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.4-alpine (${{ matrix.arch }})' + needs: php_8-4-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.4-alpine,webdevops/php-nginx:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3020,7 +5079,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.4-alpine --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3030,45 +5089,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php-nginx_8-4-alpine_publish: + name: 'webdevops/php-nginx:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.4-alpine" \ + -t "ghcr.io/webdevops/php-nginx:8.4-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx_8-4_publish: + name: 'webdevops/php-nginx:8.4 - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.4-alpine,webdevops/php-nginx:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.4" \ + -t "ghcr.io/webdevops/php-nginx:8.4" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php-nginx_8-5: - name: 'webdevops/php-nginx:8.5' - needs: - - php_8-5 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.5 (${{ matrix.arch }})' + needs: php_8-5_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.5,webdevops/php-nginx:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3076,7 +5206,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5 --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5 --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3086,45 +5216,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-nginx/8.5 - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.5,webdevops/php-nginx:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php-nginx_8-5-alpine: - name: 'webdevops/php-nginx:8.5-alpine' - needs: - - php_8-5-alpine - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php-nginx:8.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-nginx/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php-nginx:8.5-alpine,webdevops/php-nginx:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php-nginx:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3132,7 +5265,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.5-alpine --config php-nginx/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine --config php-nginx/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3142,45 +5275,116 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php-nginx_8-5-alpine_publish: + name: 'webdevops/php-nginx:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.5-alpine" \ + -t "ghcr.io/webdevops/php-nginx:8.5-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php-nginx_8-5_publish: + name: 'webdevops/php-nginx:8.5 - Publish' + runs-on: ubuntu-latest + needs: php-nginx_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-nginx/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php-nginx:8.5-alpine,webdevops/php-nginx:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php-nginx:8.5" \ + -t "ghcr.io/webdevops/php-nginx:8.5" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php-nginx:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 php_8-1: - name: 'webdevops/php:8.1' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.1 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.1 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.1,webdevops/php:8.1' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.1" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3188,7 +5392,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1 --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3198,55 +5402,113 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1 - push: true - tags: 'ghcr.io/webdevops/php:8.1,webdevops/php:8.1' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' php_8-1-alpine: - name: 'webdevops/php:8.1-alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.1-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.1-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.1-alpine,webdevops/php:8.1-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' + - + name: 'run serverspec' + run: |- + cd tests/serverspec + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine >> Dockerfile_test + echo "COPY conf/ /" >> Dockerfile_test + bundle install + bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.1-alpine --config php/test.yaml + - + if: "${{github.ref == 'refs/heads/master'}}" + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1-alpine' + php_8-1-alpine_publish: + name: 'webdevops/php:8.1-alpine - Publish' + runs-on: ubuntu-latest + needs: php_8-1-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' - - name: 'run serverspec' + name: 'Create and push multi-arch manifest' run: |- - cd tests/serverspec - echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_test - echo "COPY conf/ /" >> Dockerfile_test - bundle install - bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.1-alpine" \ + -t "ghcr.io/webdevops/php:8.1-alpine" \ + -t "webdevops/php-official:8.1-alpine" \ + -t "ghcr.io/webdevops/php-official:8.1-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.1-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.1-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php_8-1_publish: + name: 'webdevops/php:8.1 - Publish' + runs-on: ubuntu-latest + needs: php_8-1 + if: "${{github.ref == 'refs/heads/master'}}" + steps: - - name: 'run structure-test' - run: |- - cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml + uses: docker/setup-buildx-action@v3 - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' uses: docker/login-action@v3 with: @@ -3254,45 +5516,65 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.1-alpine - push: true - tags: 'ghcr.io/webdevops/php:8.1-alpine,webdevops/php:8.1-alpine' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.1" \ + -t "ghcr.io/webdevops/php:8.1" \ + -t "webdevops/php-official:8.1" \ + -t "ghcr.io/webdevops/php-official:8.1" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.1" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.1" && exit 0 + sleep $((i*i)) + done + exit 1 php_8-2: - name: 'webdevops/php:8.2' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.2 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.2 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.2,webdevops/php:8.2' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.2" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3300,7 +5582,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2 --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3310,45 +5592,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.2 - push: true - tags: 'ghcr.io/webdevops/php:8.2,webdevops/php:8.2' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' php_8-2-alpine: - name: 'webdevops/php:8.2-alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.2-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.2-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.2-alpine,webdevops/php:8.2-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3356,7 +5641,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.2-alpine --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3366,45 +5651,120 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2-alpine' + php_8-2-alpine_publish: + name: 'webdevops/php:8.2-alpine - Publish' + runs-on: ubuntu-latest + needs: php_8-2-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.2-alpine" \ + -t "ghcr.io/webdevops/php:8.2-alpine" \ + -t "webdevops/php-official:8.2-alpine" \ + -t "ghcr.io/webdevops/php-official:8.2-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.2-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.2-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php_8-2_publish: + name: 'webdevops/php:8.2 - Publish' + runs-on: ubuntu-latest + needs: php_8-2 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-official/8.2-alpine - push: true - tags: 'ghcr.io/webdevops/php:8.2-alpine,webdevops/php:8.2-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.2" \ + -t "ghcr.io/webdevops/php:8.2" \ + -t "webdevops/php-official:8.2" \ + -t "ghcr.io/webdevops/php-official:8.2" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.2" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.2" && exit 0 + sleep $((i*i)) + done + exit 1 php_8-3: - name: 'webdevops/php:8.3' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.3 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.3 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.3,webdevops/php:8.3' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.3" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3412,7 +5772,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3 --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3422,45 +5782,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.3 - push: true - tags: 'ghcr.io/webdevops/php:8.3,webdevops/php:8.3' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' php_8-3-alpine: - name: 'webdevops/php:8.3-alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.3-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.3-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.3-alpine,webdevops/php:8.3-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3468,7 +5831,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.3-alpine --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3478,45 +5841,120 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3-alpine' + php_8-3-alpine_publish: + name: 'webdevops/php:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php_8-3-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.3-alpine" \ + -t "ghcr.io/webdevops/php:8.3-alpine" \ + -t "webdevops/php-official:8.3-alpine" \ + -t "ghcr.io/webdevops/php-official:8.3-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.3-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.3-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php_8-3_publish: + name: 'webdevops/php:8.3 - Publish' + runs-on: ubuntu-latest + needs: php_8-3 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-official/8.3-alpine - push: true - tags: 'ghcr.io/webdevops/php:8.3-alpine,webdevops/php:8.3-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.3" \ + -t "ghcr.io/webdevops/php:8.3" \ + -t "webdevops/php-official:8.3" \ + -t "ghcr.io/webdevops/php-official:8.3" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.3" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.3" && exit 0 + sleep $((i*i)) + done + exit 1 php_8-4: - name: 'webdevops/php:8.4' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.4 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.4 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.4,webdevops/php:8.4' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.4" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQiLCJET0NLRVJfVEFHIjoiOC40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3524,7 +5962,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.4 --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4 --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3534,45 +5972,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.4 - push: true - tags: 'ghcr.io/webdevops/php:8.4,webdevops/php:8.4' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' php_8-4-alpine: - name: 'webdevops/php:8.4-alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.4-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.4-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.4-alpine,webdevops/php:8.4-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.4-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjQtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3580,7 +6021,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.4-alpine --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.4-alpine --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3590,45 +6031,120 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4-alpine' + php_8-4-alpine_publish: + name: 'webdevops/php:8.4-alpine - Publish' + runs-on: ubuntu-latest + needs: php_8-4-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.4-alpine" \ + -t "ghcr.io/webdevops/php:8.4-alpine" \ + -t "webdevops/php-official:8.4-alpine" \ + -t "ghcr.io/webdevops/php-official:8.4-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.4-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.4-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php_8-4_publish: + name: 'webdevops/php:8.4 - Publish' + runs-on: ubuntu-latest + needs: php_8-4 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-official/8.4-alpine - push: true - tags: 'ghcr.io/webdevops/php:8.4-alpine,webdevops/php:8.4-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.4" \ + -t "ghcr.io/webdevops/php:8.4" \ + -t "webdevops/php-official:8.4" \ + -t "ghcr.io/webdevops/php-official:8.4" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.4" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.4" && exit 0 + sleep $((i*i)) + done + exit 1 php_8-5: - name: 'webdevops/php:8.5' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.5 (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.5 + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.5,webdevops/php:8.5' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.5" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5 >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUiLCJET0NLRVJfVEFHIjoiOC41IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlX3Rlc3QifQ== Dockerfile_test @@ -3636,7 +6152,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.5 --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5 --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3646,45 +6162,48 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" - name: 'Login to hub.docker.com' - uses: docker/login-action@v3 - with: - username: '${{ secrets.DOCKERHUB_USERNAME }}' - password: '${{ secrets.DOCKERHUB_TOKEN }}' - - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/php-official/8.5 - push: true - tags: 'ghcr.io/webdevops/php:8.5,webdevops/php:8.5' - platforms: linux/amd64 + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' php_8-5-alpine: - name: 'webdevops/php:8.5-alpine' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/php:8.5-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/php-official/8.5-alpine + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/php:8.5-alpine,webdevops/php:8.5-alpine' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/php:8.5-alpine" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.5-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjUtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguNS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3692,7 +6211,7 @@ jobs: name: 'run structure-test' run: |- cd tests/structure-test - /usr/local/bin/container-structure-test test --image webdevops/php:8.5-alpine --config php/test.yaml + /usr/local/bin/container-structure-test test --image ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}-8.5-alpine --config php/test.yaml - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3702,40 +6221,115 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5-alpine' + php_8-5-alpine_publish: + name: 'webdevops/php:8.5-alpine - Publish' + runs-on: ubuntu-latest + needs: php_8-5-alpine + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.5-alpine" \ + -t "ghcr.io/webdevops/php:8.5-alpine" \ + -t "webdevops/php-official:8.5-alpine" \ + -t "ghcr.io/webdevops/php-official:8.5-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.5-alpine" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.5-alpine" && exit 0 + sleep $((i*i)) + done + exit 1 + php_8-5_publish: + name: 'webdevops/php:8.5 - Publish' + runs-on: ubuntu-latest + needs: php_8-5 + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 with: - context: docker/php-official/8.5-alpine - push: true - tags: 'ghcr.io/webdevops/php:8.5-alpine,webdevops/php:8.5-alpine' - platforms: linux/amd64 + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - + name: 'Login to hub.docker.com' + uses: docker/login-action@v3 + with: + username: '${{ secrets.DOCKERHUB_USERNAME }}' + password: '${{ secrets.DOCKERHUB_TOKEN }}' + - + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/php:8.5" \ + -t "ghcr.io/webdevops/php:8.5" \ + -t "webdevops/php-official:8.5" \ + -t "ghcr.io/webdevops/php-official:8.5" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-amd64-8.5" \ + "ghcr.io/webdevops/php:sha-${{ github.sha }}-arm64-8.5" && exit 0 + sleep $((i*i)) + done + exit 1 storage_latest: - name: 'webdevops/storage:latest' - needs: - - toolbox_latest - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/storage:latest (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/storage/latest + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/storage:sha-${{ github.sha }}-${{ matrix.arch }}-latest' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3745,40 +6339,77 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/storage:sha-${{ github.sha }}-${{ matrix.arch }}"-latest' + storage_latest_publish: + name: 'webdevops/storage:latest - Publish' + runs-on: ubuntu-latest + needs: storage_latest + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/storage/latest - push: true - tags: 'ghcr.io/webdevops/storage:latest,webdevops/storage:latest' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/storage:latest" \ + -t "ghcr.io/webdevops/storage:latest" \ + "ghcr.io/webdevops/storage:sha-${{ github.sha }}-amd64-latest" \ + "ghcr.io/webdevops/storage:sha-${{ github.sha }}-arm64-latest" && exit 0 + sleep $((i*i)) + done + exit 1 toolbox_latest: - name: 'webdevops/toolbox:latest' - needs: - - validate-automation - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/toolbox:latest (${{ matrix.arch }})' + needs: validate-automation + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/toolbox/latest + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/toolbox:sha-${{ github.sha }}-${{ matrix.arch }}-latest' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - if: "${{github.ref == 'refs/heads/master'}}" name: 'Login to ghcr.io' @@ -3788,45 +6419,82 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/toolbox:sha-${{ github.sha }}-${{ matrix.arch }}"-latest' + toolbox_latest_publish: + name: 'webdevops/toolbox:latest - Publish' + runs-on: ubuntu-latest + needs: toolbox_latest + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/toolbox/latest - push: true - tags: 'ghcr.io/webdevops/toolbox:latest,webdevops/toolbox:latest' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/toolbox:latest" \ + -t "ghcr.io/webdevops/toolbox:latest" \ + "ghcr.io/webdevops/toolbox:sha-${{ github.sha }}-amd64-latest" \ + "ghcr.io/webdevops/toolbox:sha-${{ github.sha }}-arm64-latest" && exit 0 + sleep $((i*i)) + done + exit 1 vsftp_latest: - name: 'webdevops/vsftp:latest' - needs: - - base_ubuntu-22-04 - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - + arch: amd64 + runner: ubuntu-24.04 + platform: linux/amd64 + - + arch: arm64 + runner: ubuntu-24.04-arm + platform: linux/arm64 + name: 'webdevops/vsftp:latest (${{ matrix.arch }})' + needs: base_ubuntu-22-04_publish + if: '${{ !failure() }}' + runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: - - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v3 - - name: 'Build x64' + name: 'Build (load locally)' uses: docker/build-push-action@v6 with: context: docker/vsftp/latest + platforms: '${{ matrix.platform }}' load: true - tags: 'ghcr.io/webdevops/vsftp:latest,webdevops/vsftp:latest' - platforms: linux/amd64 + tags: 'ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-${{ matrix.arch }}-latest' + cache-from: type=gha + cache-to: 'type=gha,mode=max' + build-args: 'TARGETARCH=${{ matrix.arch }}' - name: 'run serverspec' run: |- cd tests/serverspec - echo "FROM webdevops/vsftp:latest" >> Dockerfile_test + echo "FROM ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-${{ matrix.arch }}"-latest >> Dockerfile_test echo "COPY conf/ /" >> Dockerfile_test bundle install bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= Dockerfile_test @@ -3839,18 +6507,40 @@ jobs: username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - + name: 'Push arch image' if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-${{ matrix.arch }}"-latest' + vsftp_latest_publish: + name: 'webdevops/vsftp:latest - Publish' + runs-on: ubuntu-latest + needs: vsftp_latest + if: "${{github.ref == 'refs/heads/master'}}" + steps: + - + uses: docker/setup-buildx-action@v3 + - + name: 'Login to ghcr.io' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: '${{ github.actor }}' + password: '${{ secrets.GITHUB_TOKEN }}' + - name: 'Login to hub.docker.com' uses: docker/login-action@v3 with: username: '${{ secrets.DOCKERHUB_USERNAME }}' password: '${{ secrets.DOCKERHUB_TOKEN }}' - - if: "${{github.ref == 'refs/heads/master'}}" - name: Push - uses: docker/build-push-action@v6 - with: - context: docker/vsftp/latest - push: true - tags: 'ghcr.io/webdevops/vsftp:latest,webdevops/vsftp:latest' - platforms: linux/amd64 + name: 'Create and push multi-arch manifest' + run: |- + set -euo pipefail + for i in 1 2 3 4 5 6 7 8 9 10; do + docker buildx imagetools create \ + -t "webdevops/vsftp:latest" \ + -t "ghcr.io/webdevops/vsftp:latest" \ + "ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-amd64-latest" \ + "ghcr.io/webdevops/vsftp:sha-${{ github.sha }}-arm64-latest" && exit 0 + sleep $((i*i)) + done + exit 1 \ No newline at end of file diff --git a/build-local.sh b/build-local.sh index f61a80bf3..604365667 100755 --- a/build-local.sh +++ b/build-local.sh @@ -11,42 +11,30 @@ PHP_VERSION=8.5 if [ "$#" -gt 0 ]; then PHP_VERSION=$1 - if [ ! -d "$ROOT_DIR/docker/php/$PHP_VERSION" ]; then + if [ ! -d "docker/php/$PHP_VERSION" ]; then echo "PHP version $PHP_VERSION not found" exit 1 fi fi # alpine -cd $ROOT_DIR/docker/php/$PHP_VERSION-alpine -docker build -t webdevops/php:$PHP_VERSION-alpine . -cd $ROOT_DIR/docker/php-dev/$PHP_VERSION-alpine -docker build -t webdevops/php-dev:$PHP_VERSION-alpine . +docker build -t webdevops/php:$PHP_VERSION-alpine docker/php/$PHP_VERSION-alpine +docker build -t webdevops/php-dev:$PHP_VERSION-alpine docker/php-dev/$PHP_VERSION-alpine -cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION-alpine -docker build -t webdevops/php-nginx:$PHP_VERSION-alpine . -cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION-alpine -docker build -t webdevops/php-nginx-dev:$PHP_VERSION-alpine . +docker build -t webdevops/php-nginx:$PHP_VERSION-alpine docker/php-nginx/$PHP_VERSION-alpine +docker build -t webdevops/php-nginx-dev:$PHP_VERSION-alpine docker/php-nginx-dev/$PHP_VERSION-alpine -cd $ROOT_DIR/docker/php-apache/$PHP_VERSION-alpine -docker build -t webdevops/php-apache:$PHP_VERSION-alpine . -cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION-alpine -docker build -t webdevops/php-apache-dev:$PHP_VERSION-alpine . +docker build -t webdevops/php-apache:$PHP_VERSION-alpine docker/php-apache/$PHP_VERSION-alpine +docker build -t webdevops/php-apache-dev:$PHP_VERSION-alpine docker/php-apache-dev/$PHP_VERSION-alpine # debian -cd $ROOT_DIR/docker/php/$PHP_VERSION -docker build -t webdevops/php:$PHP_VERSION . -cd $ROOT_DIR/docker/php-dev/$PHP_VERSION -docker build -t webdevops/php-dev:$PHP_VERSION . - -cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION -docker build -t webdevops/php-nginx:$PHP_VERSION . -cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION -docker build -t webdevops/php-nginx-dev:$PHP_VERSION . - -cd $ROOT_DIR/docker/php-apache/$PHP_VERSION -docker build -t webdevops/php-apache:$PHP_VERSION . -cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION -docker build -t webdevops/php-apache-dev:$PHP_VERSION . +docker build -t webdevops/php:$PHP_VERSION docker/php/$PHP_VERSION +docker build -t webdevops/php-dev:$PHP_VERSION docker/php-dev/$PHP_VERSION + +docker build -t webdevops/php-nginx:$PHP_VERSION docker/php-nginx/$PHP_VERSION +docker build -t webdevops/php-nginx-dev:$PHP_VERSION docker/php-nginx-dev/$PHP_VERSION + +docker build -t webdevops/php-apache:$PHP_VERSION docker/php-apache/$PHP_VERSION +docker build -t webdevops/php-apache-dev:$PHP_VERSION docker/php-apache-dev/$PHP_VERSION docker images | grep webdevops | grep $PHP_VERSION diff --git a/ci/src/Commands/GithubCommand.php b/ci/src/Commands/GithubCommand.php index 7b079a22b..8d0af2e21 100644 --- a/ci/src/Commands/GithubCommand.php +++ b/ci/src/Commands/GithubCommand.php @@ -85,12 +85,16 @@ private function traverse(Node $node): void if ($node->getLevel() > $this->deepestLevel) { $this->deepestLevel = $node->getLevel(); } - $this->jobs[GithubJobBuilder::toJobId($node->getId())] = $this->jobBuilder->getJobDescription($nodeAr); + $this->jobs = [ + ...$this->jobs, + ...$this->jobBuilder->getJobsDescription($nodeAr), + ]; if ($this->isNameBlacklisted($nodeAr['id'])) { // $this->jobs[GithubJobBuilder::toJobId($node->getId())] = array_merge($this->jobs[GithubJobBuilder::toJobId($node->getId())], ['when' => 'manual']); $line .= ' *blacklisted*'; if ($node->get('tag') !== $this->_settings['docker']['autoLatestTag']) { unset($this->jobs[GithubJobBuilder::toJobId($node->getId())]); + unset($this->jobs[GithubJobBuilder::toJobId($node->getId()) . '_publish']); } } $this->output->write([str_pad('', $node->getLevel() - 1, "\t", STR_PAD_LEFT), $line, PHP_EOL]); diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index 65a404750..1675249ab 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -2,83 +2,148 @@ namespace Webdevops\Build; +use function array_filter; +use function array_values; +use function dirname; +use function implode; use function str_replace; class GithubJobBuilder { - - public function getJobDescription(array $node): array + /** + * @return array> + */ + public function getJobsDescription(array $node): array { $serverSpec = $this->serverSpec($node); $structuredTests = $this->structuredTests($node); + $jobId = GithubJobBuilder::toJobId($node['name']); + $needs = ($node['parent'] ?? null) ? GithubJobBuilder::toJobId($node['parent']) . '_publish' : 'validate-automation'; + + $pushTags = []; + $pushTags[] = '-t "' . $node['id'] . '"'; + $pushTags[] = '-t "ghcr.io/' . $node['id'] . '"'; + foreach ($node['aliases'] as $alias) { + $pushTags[] = '-t "' . $alias . '"'; + $pushTags[] = '-t "ghcr.io/' . $alias . '"'; + } return [ - 'name' => $node['name'], - 'needs' => [ - ($node['parent'] ?? null) ? GithubJobBuilder::toJobId($node['parent']) : 'validate-automation', - ], - 'runs-on' => 'ubuntu-latest', - 'container' => 'webdevops/dockerfile-build-env', - 'steps' => array_values( - array_filter( - [ - ['uses' => 'actions/checkout@v4'], -// ['uses' => 'docker/setup-qemu-action@v3'], // only needed for ARM builds - ['uses' => 'docker/setup-buildx-action@v3'], - [ - 'name' => 'Build x64', - 'uses' => 'docker/build-push-action@v6', - 'with' => [ - 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), - 'load' => true, - 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], - 'platforms' => 'linux/amd64', + $jobId => [ + 'strategy' => [ + 'fail-fast' => false, + 'matrix' => [ + 'include' => [ + [ + 'arch' => 'amd64', + 'runner' => 'ubuntu-24.04', + 'platform' => 'linux/amd64', ], - ], - $serverSpec ? [ - 'name' => 'run serverspec', - 'run' => implode("\n", $serverSpec), - ] : null, - $structuredTests ? [ - 'name' => 'run structure-test', - 'run' => implode("\n", $structuredTests), - ] : null, - [ - 'if' => '${{github.ref == \'refs/heads/master\'}}', - 'name' => 'Login to ghcr.io', - 'uses' => 'docker/login-action@v3', - 'with' => [ - 'registry' => 'ghcr.io', - 'username' => '${{ github.actor }}', - 'password' => '${{ secrets.GITHUB_TOKEN }}', + [ + 'arch' => 'arm64', + 'runner' => 'ubuntu-24.04-arm', + 'platform' => 'linux/arm64', ], ], + ], + ], + 'name' => $node['name'] . ' (${{ matrix.arch }})', + 'needs' => $needs, + // even run if previous job skipped + 'if' => '${{ !failure() }}', + 'runs-on' => '${{ matrix.runner }}', + 'container' => 'webdevops/dockerfile-build-env', + 'steps' => array_values( + array_filter( [ - // login after the build so the rate limit of github is used and not from our login Token. - 'if' => '${{github.ref == \'refs/heads/master\'}}', - 'name' => 'Login to hub.docker.com', - 'uses' => 'docker/login-action@v3', - 'with' => [ - 'username' => '${{ secrets.DOCKERHUB_USERNAME }}', - 'password' => '${{ secrets.DOCKERHUB_TOKEN }}', + ['uses' => 'actions/checkout@v6'], + ['uses' => 'docker/setup-buildx-action@v3'], + [ + 'name' => 'Build (load locally)', + 'uses' => 'docker/build-push-action@v6', + 'with' => [ + 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), + 'platforms' => '${{ matrix.platform }}', + 'load' => true, + 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}-' . $node['tag'], + 'cache-from' => 'type=gha', + 'cache-to' => 'type=gha,mode=max', + 'build-args' => implode("\n", [ + 'TARGETARCH=${{ matrix.arch }}', + ]), + ], ], - ], - [ - 'if' => '${{github.ref == \'refs/heads/master\'}}', - 'name' => 'Push', -// 'name' => 'Build ARM + Push', - 'uses' => 'docker/build-push-action@v6', - 'with' => [ - 'context' => dirname(str_replace(__DIR__ . '/../../', '', $node['file'])), - 'push' => true, - 'tags' => 'ghcr.io/webdevops/' . $node['image'] . ':' . $node['tag'] . ',webdevops/' . $node['image'] . ':' . $node['tag'], - 'platforms' => 'linux/amd64', -// 'platforms' => 'linux/amd64,linux/arm64', // ARM not ready yet + $serverSpec ? [ + 'name' => 'run serverspec', + 'run' => implode("\n", $serverSpec), + ] : null, + $structuredTests ? [ + 'name' => 'run structure-test', + 'run' => implode("\n", $structuredTests), + ] : null, + [ + 'if' => '${{github.ref == \'refs/heads/master\'}}', + 'name' => 'Login to ghcr.io', + 'uses' => 'docker/login-action@v3', + 'with' => [ + 'registry' => 'ghcr.io', + 'username' => '${{ github.actor }}', + 'password' => '${{ secrets.GITHUB_TOKEN }}', + ], + ], + [ + 'name' => 'Push arch image', + 'if' => '${{github.ref == \'refs/heads/master\'}}', + 'run' => 'docker push "ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}"-' . $node['tag'], ], ], - ], + ), ), - ), + ], + $jobId . '_publish' => [ + 'name' => $node['name'] . ' - Publish', + 'runs-on' => 'ubuntu-latest', + 'needs' => $jobId, + 'if' => '${{github.ref == \'refs/heads/master\'}}', + 'steps' => [ + ['uses' => 'docker/setup-buildx-action@v3'], + [ + 'name' => 'Login to ghcr.io', + 'uses' => 'docker/login-action@v3', + 'with' => [ + 'registry' => 'ghcr.io', + 'username' => '${{ github.actor }}', + 'password' => '${{ secrets.GITHUB_TOKEN }}', + ], + ], + [ + 'name' => 'Login to hub.docker.com', + 'uses' => 'docker/login-action@v3', + 'with' => [ + 'username' => '${{ secrets.DOCKERHUB_USERNAME }}', + 'password' => '${{ secrets.DOCKERHUB_TOKEN }}', + ], + ], + [ + 'name' => 'Create and push multi-arch manifest', + 'run' => + // we need the retry loop here because sometimes docker hub returns errors when pushing manifests (especially if pushed to the same image multiple times in a short time frame) + implode("\n", [ + 'set -euo pipefail', + 'for i in 1 2 3 4 5 6 7 8 9 10; do', + ' ' . implode(" \\\n ", [ + 'docker buildx imagetools create', + ...$pushTags, + '"ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-amd64-' . $node['tag'] . '"', + '"ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-arm64-' . $node['tag'] . '" && exit 0', + ]), + ' sleep $((i*i))', + 'done', + 'exit 1', + ]), + ], + ], + ], ]; } @@ -98,14 +163,13 @@ private function serverSpec(array $node): array return []; } -// $testDockerfile = uniqid('Dockerfile_', true); $testDockerfile = 'Dockerfile_test'; $specConfig = $node['serverspec']; $specConfig['DOCKERFILE'] = $testDockerfile; $encodedJsonConfig = base64_encode(json_encode($specConfig)); $script = [ 'cd tests/serverspec', - 'echo "FROM ' . $node['id'] . '" >> ' . $testDockerfile, + 'echo "FROM ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}"-' . $node['tag'] . ' >> ' . $testDockerfile, 'echo "COPY conf/ /" >> ' . $testDockerfile, ]; $script[] = 'bundle install'; @@ -119,9 +183,9 @@ private function structuredTests(array $node): array if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/test.yaml')) { $script[] = 'cd tests/structure-test'; if (file_exists(__DIR__ . '/../../tests/structure-test/' . $node['image'] . '/' . $node['tag'] . '/test.yaml')) { - $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml --config ' . $node['image'] . '/' . $node['tag'] . '/test.yaml'; + $script[] = '/usr/local/bin/container-structure-test test --image ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}-' . $node['tag'] . ' --config ' . $node['image'] . '/test.yaml --config ' . $node['image'] . '/' . $node['tag'] . '/test.yaml'; } else { - $script[] = '/usr/local/bin/container-structure-test test --image ' . $node['name'] . ' --config ' . $node['image'] . '/test.yaml'; + $script[] = '/usr/local/bin/container-structure-test test --image ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}-' . $node['tag'] . ' --config ' . $node['image'] . '/test.yaml'; } } return $script; @@ -133,7 +197,7 @@ public function getValidationConfig(): array 'name' => 'Validate Automation', 'runs-on' => 'ubuntu-latest', 'steps' => [ - ['uses' => 'actions/checkout@v4'], + ['uses' => 'actions/checkout@v6'], [ 'name' => 'Validate that template/* are used to generate Dockerfiles', 'run' => implode("\n", [ diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 6e21b3a7f..610e71e73 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -4,6 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ FROM webdevops/base-app:ubuntu-22.04 +ARG TARGETARCH RUN apt-install \ build-essential \ @@ -19,18 +20,20 @@ RUN apt-install \ ruby \ ruby-dev \ ruby-bundler \ + libyaml-dev \ && curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \ && python2 get-pip.py \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ - && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ + && add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ && apt-install docker-ce \ && usermod -aG docker application \ - && curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \ - && chmod +x container-structure-test-linux-amd64 \ - && mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test \ + && curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-$TARGETARCH \ + && chmod +x container-structure-test-linux-$TARGETARCH \ + && mv container-structure-test-linux-$TARGETARCH /usr/local/bin/container-structure-test \ && pip install --upgrade pip \ && hash -r pip \ && pip install --upgrade setuptools \ + && pip install Cython==0.29.21 wheel \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && gem install bundler -v 2.1.4 --no-document \ && cd /tmp/Dockerfile/tests/serverspec \ diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 index b6ebd683f..31120da94 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 +++ b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 @@ -1,4 +1,5 @@ {{ docker.from("base-app","ubuntu-22.04") }} +ARG TARGETARCH RUN apt-install \ build-essential \ @@ -14,18 +15,20 @@ RUN apt-install \ ruby \ ruby-dev \ ruby-bundler \ + libyaml-dev \ && curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \ && python2 get-pip.py \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ - && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ + && add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ && apt-install docker-ce \ && usermod -aG docker application \ - && curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \ - && chmod +x container-structure-test-linux-amd64 \ - && mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test \ + && curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-$TARGETARCH \ + && chmod +x container-structure-test-linux-$TARGETARCH \ + && mv container-structure-test-linux-$TARGETARCH /usr/local/bin/container-structure-test \ && pip install --upgrade pip \ && hash -r pip \ && pip install --upgrade setuptools \ + && pip install Cython==0.29.21 wheel \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && gem install bundler -v 2.1.4 --no-document \ && cd /tmp/Dockerfile/tests/serverspec \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 1f0338312..6f67e0490 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index c93cc525d..625accc8b 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 228fe7191..645dabd93 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 0b0fb6f14..1aff39596 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 081ab7660..d3ba03564 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 9db5049bc..17a6da264 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -141,7 +141,7 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index fd2e752ee..1f98e1b35 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index d1c15bdd3..e11eaef89 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 23b67b6cf..cde3347c3 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile index 93c27f604..7377141ac 100644 --- a/docker/php-official/8.3/Dockerfile +++ b/docker/php-official/8.3/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile index a4f9f5c5b..9aa55af3d 100644 --- a/docker/php-official/8.4-alpine/Dockerfile +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile index 92f2cfc17..eb2bc75e2 100644 --- a/docker/php-official/8.4/Dockerfile +++ b/docker/php-official/8.4/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ amqp \ diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile index 0dc667ae0..bfda78378 100644 --- a/docker/php-official/8.5/Dockerfile +++ b/docker/php-official/8.5/Dockerfile @@ -143,7 +143,7 @@ RUN set -x \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && docker-php-ext-install \ bcmath \ amqp \ From a340fab836df07607a11f1f38f8662de076956a9 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 26 Jan 2026 13:08:31 +0100 Subject: [PATCH 61/63] =?UTF-8?q?=F0=9F=90=9B=20do=20not=20run=20job=20if?= =?UTF-8?q?=20workflow=20was=20cancelled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yaml | 144 +++++++++++++++++------------------ ci/src/GithubJobBuilder.php | 2 +- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fc6dcc97a..5afadba2c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -41,7 +41,7 @@ jobs: platform: linux/arm64 name: 'webdevops/apache:alpine (${{ matrix.arch }})' needs: base_alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -129,7 +129,7 @@ jobs: platform: linux/arm64 name: 'webdevops/base-app:alpine (${{ matrix.arch }})' needs: base_alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -222,7 +222,7 @@ jobs: platform: linux/arm64 name: 'webdevops/base-app:ubuntu-22.04 (${{ matrix.arch }})' needs: base_ubuntu-22-04_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -317,7 +317,7 @@ jobs: platform: linux/arm64 name: 'webdevops/base:alpine (${{ matrix.arch }})' needs: bootstrap_alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -410,7 +410,7 @@ jobs: platform: linux/arm64 name: 'webdevops/base:ubuntu-22.04 (${{ matrix.arch }})' needs: bootstrap_ubuntu-22-04_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -505,7 +505,7 @@ jobs: platform: linux/arm64 name: 'webdevops/bootstrap:alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -598,7 +598,7 @@ jobs: platform: linux/arm64 name: 'webdevops/bootstrap:ubuntu-22.04 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -693,7 +693,7 @@ jobs: platform: linux/arm64 name: 'webdevops/dockerfile-build-env:latest (${{ matrix.arch }})' needs: base-app_ubuntu-22-04_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -773,7 +773,7 @@ jobs: platform: linux/arm64 name: 'webdevops/nginx:alpine (${{ matrix.arch }})' needs: base_alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -861,7 +861,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.1 (${{ matrix.arch }})' needs: php-apache_8-1_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -915,7 +915,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.1-alpine (${{ matrix.arch }})' needs: php-apache_8-1-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1037,7 +1037,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.2 (${{ matrix.arch }})' needs: php-apache_8-2_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1091,7 +1091,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.2-alpine (${{ matrix.arch }})' needs: php-apache_8-2-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1213,7 +1213,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.3 (${{ matrix.arch }})' needs: php-apache_8-3_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1267,7 +1267,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.3-alpine (${{ matrix.arch }})' needs: php-apache_8-3-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1389,7 +1389,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.4 (${{ matrix.arch }})' needs: php-apache_8-4_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1443,7 +1443,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.4-alpine (${{ matrix.arch }})' needs: php-apache_8-4-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1565,7 +1565,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.5 (${{ matrix.arch }})' needs: php-apache_8-5_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1619,7 +1619,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache-dev:8.5-alpine (${{ matrix.arch }})' needs: php-apache_8-5-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1741,7 +1741,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.1 (${{ matrix.arch }})' needs: php_8-1_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1795,7 +1795,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.1-alpine (${{ matrix.arch }})' needs: php_8-1-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1917,7 +1917,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.2 (${{ matrix.arch }})' needs: php_8-2_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -1971,7 +1971,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.2-alpine (${{ matrix.arch }})' needs: php_8-2-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2093,7 +2093,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.3 (${{ matrix.arch }})' needs: php_8-3_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2147,7 +2147,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.3-alpine (${{ matrix.arch }})' needs: php_8-3-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2269,7 +2269,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.4 (${{ matrix.arch }})' needs: php_8-4_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2323,7 +2323,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.4-alpine (${{ matrix.arch }})' needs: php_8-4-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2445,7 +2445,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.5 (${{ matrix.arch }})' needs: php_8-5_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2499,7 +2499,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-apache:8.5-alpine (${{ matrix.arch }})' needs: php_8-5-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2621,7 +2621,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.1 (${{ matrix.arch }})' needs: php_8-1_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2680,7 +2680,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.1-alpine (${{ matrix.arch }})' needs: php_8-1-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2807,7 +2807,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.2 (${{ matrix.arch }})' needs: php_8-2_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2866,7 +2866,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.2-alpine (${{ matrix.arch }})' needs: php_8-2-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -2993,7 +2993,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.3 (${{ matrix.arch }})' needs: php_8-3_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3052,7 +3052,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.3-alpine (${{ matrix.arch }})' needs: php_8-3-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3179,7 +3179,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.4 (${{ matrix.arch }})' needs: php_8-4_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3238,7 +3238,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.4-alpine (${{ matrix.arch }})' needs: php_8-4-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3365,7 +3365,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.5 (${{ matrix.arch }})' needs: php_8-5_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3424,7 +3424,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-dev:8.5-alpine (${{ matrix.arch }})' needs: php_8-5-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3551,7 +3551,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.1 (${{ matrix.arch }})' needs: php-nginx_8-1_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3605,7 +3605,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.1-alpine (${{ matrix.arch }})' needs: php-nginx_8-1-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3727,7 +3727,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.2 (${{ matrix.arch }})' needs: php-nginx_8-2_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3781,7 +3781,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.2-alpine (${{ matrix.arch }})' needs: php-nginx_8-2-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3903,7 +3903,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.3 (${{ matrix.arch }})' needs: php-nginx_8-3_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -3957,7 +3957,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.3-alpine (${{ matrix.arch }})' needs: php-nginx_8-3-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4079,7 +4079,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.4 (${{ matrix.arch }})' needs: php-nginx_8-4_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4133,7 +4133,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.4-alpine (${{ matrix.arch }})' needs: php-nginx_8-4-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4255,7 +4255,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.5 (${{ matrix.arch }})' needs: php-nginx_8-5_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4309,7 +4309,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx-dev:8.5-alpine (${{ matrix.arch }})' needs: php-nginx_8-5-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4431,7 +4431,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.1 (${{ matrix.arch }})' needs: php_8-1_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4490,7 +4490,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.1-alpine (${{ matrix.arch }})' needs: php_8-1-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4617,7 +4617,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.2 (${{ matrix.arch }})' needs: php_8-2_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4676,7 +4676,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.2-alpine (${{ matrix.arch }})' needs: php_8-2-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4803,7 +4803,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.3 (${{ matrix.arch }})' needs: php_8-3_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4862,7 +4862,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.3-alpine (${{ matrix.arch }})' needs: php_8-3-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -4989,7 +4989,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.4 (${{ matrix.arch }})' needs: php_8-4_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5048,7 +5048,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.4-alpine (${{ matrix.arch }})' needs: php_8-4-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5175,7 +5175,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.5 (${{ matrix.arch }})' needs: php_8-5_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5234,7 +5234,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php-nginx:8.5-alpine (${{ matrix.arch }})' needs: php_8-5-alpine_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5361,7 +5361,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.1 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5420,7 +5420,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.1-alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5551,7 +5551,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.2 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5610,7 +5610,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.2-alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5741,7 +5741,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.3 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5800,7 +5800,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.3-alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5931,7 +5931,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.4 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -5990,7 +5990,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.4-alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -6121,7 +6121,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.5 (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -6180,7 +6180,7 @@ jobs: platform: linux/arm64 name: 'webdevops/php:8.5-alpine (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -6311,7 +6311,7 @@ jobs: platform: linux/arm64 name: 'webdevops/storage:latest (${{ matrix.arch }})' needs: toolbox_latest_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -6391,7 +6391,7 @@ jobs: platform: linux/arm64 name: 'webdevops/toolbox:latest (${{ matrix.arch }})' needs: validate-automation - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: @@ -6471,7 +6471,7 @@ jobs: platform: linux/arm64 name: 'webdevops/vsftp:latest (${{ matrix.arch }})' needs: base_ubuntu-22-04_publish - if: '${{ !failure() }}' + if: '${{ !failure() && !cancelled() }}' runs-on: '${{ matrix.runner }}' container: webdevops/dockerfile-build-env steps: diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index 1675249ab..f5679768e 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -50,7 +50,7 @@ public function getJobsDescription(array $node): array 'name' => $node['name'] . ' (${{ matrix.arch }})', 'needs' => $needs, // even run if previous job skipped - 'if' => '${{ !failure() }}', + 'if' => '${{ !failure() && !cancelled() }}', 'runs-on' => '${{ matrix.runner }}', 'container' => 'webdevops/dockerfile-build-env', 'steps' => array_values( From 96d80d48bb2616e64e2d2d8d85e7b08a24bdd089 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 3 Mar 2026 08:33:37 +0100 Subject: [PATCH 62/63] =?UTF-8?q?=F0=9F=90=9B=20fix=20php=208.1=20builds?= =?UTF-8?q?=20+=20=F0=9F=94=A5=20remove=20old=20php=20versions=20<=208.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/php-apache-dev/5.6/Dockerfile | 32 -- docker/php-apache-dev/5.6/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../5.6/conf/bin/service.d/blackfire-agent.sh | 25 -- .../5.6/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../5.6/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.0/Dockerfile | 32 -- docker/php-apache-dev/7.0/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.0/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.1-alpine/Dockerfile | 39 --- .../7.1-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.1/Dockerfile | 32 -- docker/php-apache-dev/7.1/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.1/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.1/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.1/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.2-alpine/Dockerfile | 39 --- .../7.2-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.2/Dockerfile | 32 -- docker/php-apache-dev/7.2/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.2/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.2/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.2/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.3-alpine/Dockerfile | 39 --- .../7.3-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.3/Dockerfile | 32 -- docker/php-apache-dev/7.3/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.3/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.3/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.3/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.4-alpine/Dockerfile | 39 --- .../7.4-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/7.4/Dockerfile | 32 -- docker/php-apache-dev/7.4/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.4/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.4/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.4/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/8.0-alpine/Dockerfile | 38 -- .../8.0-alpine/Dockerfile.jinja2 | 11 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/8.0/Dockerfile | 32 -- docker/php-apache-dev/8.0/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../8.0/conf/etc/httpd/conf.d/02-dev.conf | 8 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-apache-dev.sh | 5 - docker/php-apache-dev/8.5-alpine/Dockerfile | 5 +- docker/php-apache/5.6/Dockerfile | 30 -- docker/php-apache/5.6/Dockerfile.jinja2 | 13 - .../5.6/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../5.6/conf/bin/service.d/httpd.sh | 14 - .../5.6/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../5.6/conf/etc/httpd/conf.d/10-log.conf | 4 - .../5.6/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../5.6/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/5.6/conf/etc/httpd/global.conf | 1 - .../php-apache/5.6/conf/etc/httpd/main.conf | 10 - docker/php-apache/5.6/conf/etc/httpd/php.conf | 1 - .../5.6/conf/etc/httpd/ssl/server.crt | 28 -- .../5.6/conf/etc/httpd/ssl/server.csr | 26 -- .../5.6/conf/etc/httpd/ssl/server.key | 51 --- .../5.6/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/5.6/conf/etc/httpd/vhost.conf | 36 -- .../5.6/conf/etc/httpd/vhost.ssl.conf | 26 -- .../5.6/conf/etc/supervisor.d/apache.conf | 14 - .../5.6/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../5.6/conf/provision/bootstrap.d/10-php.sh | 8 - .../5.6/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.0/Dockerfile | 30 -- docker/php-apache/7.0/Dockerfile.jinja2 | 13 - .../7.0/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.0/conf/bin/service.d/httpd.sh | 14 - .../7.0/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../7.0/conf/etc/httpd/conf.d/10-log.conf | 4 - .../7.0/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../7.0/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/7.0/conf/etc/httpd/global.conf | 1 - .../php-apache/7.0/conf/etc/httpd/main.conf | 10 - docker/php-apache/7.0/conf/etc/httpd/php.conf | 1 - .../7.0/conf/etc/httpd/ssl/server.crt | 28 -- .../7.0/conf/etc/httpd/ssl/server.csr | 26 -- .../7.0/conf/etc/httpd/ssl/server.key | 51 --- .../7.0/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/7.0/conf/etc/httpd/vhost.conf | 36 -- .../7.0/conf/etc/httpd/vhost.ssl.conf | 26 -- .../7.0/conf/etc/supervisor.d/apache.conf | 14 - .../7.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../7.0/conf/provision/bootstrap.d/10-php.sh | 8 - .../7.0/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.1-alpine/Dockerfile | 34 -- .../php-apache/7.1-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.1-alpine/conf/bin/service.d/httpd.sh | 13 - .../7.1-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 -- .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../7.1-alpine/conf/etc/httpd/global.conf | 1 - .../7.1-alpine/conf/etc/httpd/main.conf | 10 - .../7.1-alpine/conf/etc/httpd/php.conf | 1 - .../7.1-alpine/conf/etc/httpd/ssl/server.crt | 28 -- .../7.1-alpine/conf/etc/httpd/ssl/server.csr | 26 -- .../7.1-alpine/conf/etc/httpd/ssl/server.key | 51 --- .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../7.1-alpine/conf/etc/httpd/vhost.conf | 36 -- .../7.1-alpine/conf/etc/httpd/vhost.ssl.conf | 26 -- .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.1/Dockerfile | 30 -- docker/php-apache/7.1/Dockerfile.jinja2 | 13 - .../7.1/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.1/conf/bin/service.d/httpd.sh | 14 - .../7.1/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../7.1/conf/etc/httpd/conf.d/10-log.conf | 4 - .../7.1/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../7.1/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/7.1/conf/etc/httpd/global.conf | 1 - .../php-apache/7.1/conf/etc/httpd/main.conf | 10 - docker/php-apache/7.1/conf/etc/httpd/php.conf | 1 - .../7.1/conf/etc/httpd/ssl/server.crt | 28 -- .../7.1/conf/etc/httpd/ssl/server.csr | 26 -- .../7.1/conf/etc/httpd/ssl/server.key | 51 --- .../7.1/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/7.1/conf/etc/httpd/vhost.conf | 36 -- .../7.1/conf/etc/httpd/vhost.ssl.conf | 26 -- .../7.1/conf/etc/supervisor.d/apache.conf | 14 - .../7.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../7.1/conf/provision/bootstrap.d/10-php.sh | 8 - .../7.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.2-alpine/Dockerfile | 34 -- .../php-apache/7.2-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.2-alpine/conf/bin/service.d/httpd.sh | 13 - .../7.2-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 -- .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../7.2-alpine/conf/etc/httpd/global.conf | 1 - .../7.2-alpine/conf/etc/httpd/main.conf | 10 - .../7.2-alpine/conf/etc/httpd/php.conf | 1 - .../7.2-alpine/conf/etc/httpd/ssl/server.crt | 28 -- .../7.2-alpine/conf/etc/httpd/ssl/server.csr | 26 -- .../7.2-alpine/conf/etc/httpd/ssl/server.key | 51 --- .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../7.2-alpine/conf/etc/httpd/vhost.conf | 36 -- .../7.2-alpine/conf/etc/httpd/vhost.ssl.conf | 26 -- .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.2/Dockerfile | 30 -- docker/php-apache/7.2/Dockerfile.jinja2 | 13 - .../7.2/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.2/conf/bin/service.d/httpd.sh | 14 - .../7.2/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../7.2/conf/etc/httpd/conf.d/10-log.conf | 4 - .../7.2/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../7.2/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/7.2/conf/etc/httpd/global.conf | 1 - .../php-apache/7.2/conf/etc/httpd/main.conf | 10 - docker/php-apache/7.2/conf/etc/httpd/php.conf | 1 - .../7.2/conf/etc/httpd/ssl/server.crt | 28 -- .../7.2/conf/etc/httpd/ssl/server.csr | 26 -- .../7.2/conf/etc/httpd/ssl/server.key | 51 --- .../7.2/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/7.2/conf/etc/httpd/vhost.conf | 36 -- .../7.2/conf/etc/httpd/vhost.ssl.conf | 26 -- .../7.2/conf/etc/supervisor.d/apache.conf | 14 - .../7.2/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../7.2/conf/provision/bootstrap.d/10-php.sh | 8 - .../7.2/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.3-alpine/Dockerfile | 34 -- .../php-apache/7.3-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.3-alpine/conf/bin/service.d/httpd.sh | 13 - .../7.3-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 -- .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../7.3-alpine/conf/etc/httpd/global.conf | 1 - .../7.3-alpine/conf/etc/httpd/main.conf | 10 - .../7.3-alpine/conf/etc/httpd/php.conf | 1 - .../7.3-alpine/conf/etc/httpd/ssl/server.crt | 28 -- .../7.3-alpine/conf/etc/httpd/ssl/server.csr | 26 -- .../7.3-alpine/conf/etc/httpd/ssl/server.key | 51 --- .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../7.3-alpine/conf/etc/httpd/vhost.conf | 36 -- .../7.3-alpine/conf/etc/httpd/vhost.ssl.conf | 26 -- .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.3/Dockerfile | 30 -- docker/php-apache/7.3/Dockerfile.jinja2 | 13 - .../7.3/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.3/conf/bin/service.d/httpd.sh | 14 - .../7.3/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../7.3/conf/etc/httpd/conf.d/10-log.conf | 4 - .../7.3/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../7.3/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/7.3/conf/etc/httpd/global.conf | 1 - .../php-apache/7.3/conf/etc/httpd/main.conf | 10 - docker/php-apache/7.3/conf/etc/httpd/php.conf | 1 - .../7.3/conf/etc/httpd/ssl/server.crt | 28 -- .../7.3/conf/etc/httpd/ssl/server.csr | 26 -- .../7.3/conf/etc/httpd/ssl/server.key | 51 --- .../7.3/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/7.3/conf/etc/httpd/vhost.conf | 36 -- .../7.3/conf/etc/httpd/vhost.ssl.conf | 26 -- .../7.3/conf/etc/supervisor.d/apache.conf | 14 - .../7.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../7.3/conf/provision/bootstrap.d/10-php.sh | 8 - .../7.3/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.4-alpine/Dockerfile | 34 -- .../php-apache/7.4-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.4-alpine/conf/bin/service.d/httpd.sh | 13 - .../7.4-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 -- .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../7.4-alpine/conf/etc/httpd/global.conf | 1 - .../7.4-alpine/conf/etc/httpd/main.conf | 10 - .../7.4-alpine/conf/etc/httpd/php.conf | 1 - .../7.4-alpine/conf/etc/httpd/ssl/server.crt | 28 -- .../7.4-alpine/conf/etc/httpd/ssl/server.csr | 26 -- .../7.4-alpine/conf/etc/httpd/ssl/server.key | 51 --- .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../7.4-alpine/conf/etc/httpd/vhost.conf | 36 -- .../7.4-alpine/conf/etc/httpd/vhost.ssl.conf | 26 -- .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/7.4/Dockerfile | 30 -- docker/php-apache/7.4/Dockerfile.jinja2 | 13 - .../7.4/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../7.4/conf/bin/service.d/httpd.sh | 14 - .../7.4/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../7.4/conf/etc/httpd/conf.d/10-log.conf | 4 - .../7.4/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../7.4/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/7.4/conf/etc/httpd/global.conf | 1 - .../php-apache/7.4/conf/etc/httpd/main.conf | 10 - docker/php-apache/7.4/conf/etc/httpd/php.conf | 1 - .../7.4/conf/etc/httpd/ssl/server.crt | 28 -- .../7.4/conf/etc/httpd/ssl/server.csr | 26 -- .../7.4/conf/etc/httpd/ssl/server.key | 51 --- .../7.4/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/7.4/conf/etc/httpd/vhost.conf | 36 -- .../7.4/conf/etc/httpd/vhost.ssl.conf | 26 -- .../7.4/conf/etc/supervisor.d/apache.conf | 14 - .../7.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../7.4/conf/provision/bootstrap.d/10-php.sh | 8 - .../7.4/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/8.0-alpine/Dockerfile | 33 -- .../php-apache/8.0-alpine/Dockerfile.jinja2 | 12 - .../conf/bin/service.d/httpd.d/10-init.sh | 6 - .../8.0-alpine/conf/bin/service.d/httpd.sh | 13 - .../8.0-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../conf/etc/httpd/conf.d/10-log.conf | 4 - .../conf/etc/httpd/conf.d/10-php.conf | 37 -- .../conf/etc/httpd/conf.d/10-server.conf | 18 - .../8.0-alpine/conf/etc/httpd/global.conf | 1 - .../8.0-alpine/conf/etc/httpd/main.conf | 10 - .../8.0-alpine/conf/etc/httpd/php.conf | 1 - .../8.0-alpine/conf/etc/httpd/ssl/server.crt | 28 -- .../8.0-alpine/conf/etc/httpd/ssl/server.csr | 26 -- .../8.0-alpine/conf/etc/httpd/ssl/server.key | 51 --- .../conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../8.0-alpine/conf/etc/httpd/vhost.conf | 36 -- .../8.0-alpine/conf/etc/httpd/vhost.ssl.conf | 26 -- .../conf/etc/supervisor.d/apache.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../conf/provision/bootstrap.d/10-php.sh | 8 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-apache/8.0/Dockerfile | 30 -- docker/php-apache/8.0/Dockerfile.jinja2 | 13 - .../8.0/conf/bin/service.d/httpd.d/10-init.sh | 6 - .../8.0/conf/bin/service.d/httpd.sh | 14 - .../8.0/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 - .../8.0/conf/etc/httpd/conf.d/10-log.conf | 4 - .../8.0/conf/etc/httpd/conf.d/10-php.conf | 37 -- .../8.0/conf/etc/httpd/conf.d/10-server.conf | 18 - .../php-apache/8.0/conf/etc/httpd/global.conf | 1 - .../php-apache/8.0/conf/etc/httpd/main.conf | 10 - docker/php-apache/8.0/conf/etc/httpd/php.conf | 1 - .../8.0/conf/etc/httpd/ssl/server.crt | 28 -- .../8.0/conf/etc/httpd/ssl/server.csr | 26 -- .../8.0/conf/etc/httpd/ssl/server.key | 51 --- .../8.0/conf/etc/httpd/vhost.common.conf | 7 - .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 - .../php-apache/8.0/conf/etc/httpd/vhost.conf | 36 -- .../8.0/conf/etc/httpd/vhost.ssl.conf | 26 -- .../8.0/conf/etc/supervisor.d/apache.conf | 14 - .../8.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ------ .../8.0/conf/provision/bootstrap.d/10-php.sh | 8 - .../8.0/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 - docker/php-dev/5.6/Dockerfile | 24 -- docker/php-dev/5.6/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../5.6/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../5.6/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.0/Dockerfile | 24 -- docker/php-dev/7.0/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.1-alpine/Dockerfile | 31 -- docker/php-dev/7.1-alpine/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.1/Dockerfile | 24 -- docker/php-dev/7.1/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.1/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.1/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.2-alpine/Dockerfile | 31 -- docker/php-dev/7.2-alpine/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.2/Dockerfile | 24 -- docker/php-dev/7.2/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.2/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.2/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.3-alpine/Dockerfile | 31 -- docker/php-dev/7.3-alpine/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.3/Dockerfile | 24 -- docker/php-dev/7.3/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.3/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.3/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.4-alpine/Dockerfile | 31 -- docker/php-dev/7.4-alpine/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/7.4/Dockerfile | 24 -- docker/php-dev/7.4/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.4/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.4/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/8.0-alpine/Dockerfile | 30 -- docker/php-dev/8.0-alpine/Dockerfile.jinja2 | 7 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/8.0/Dockerfile | 24 -- docker/php-dev/8.0/Dockerfile.jinja2 | 8 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../bin/service.d/ssh.d/99-development.sh | 3 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/bootstrap.d/99-development.sh | 5 - .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ docker/php-dev/8.5-alpine/Dockerfile | 5 +- docker/php-nginx-dev/5.6/Dockerfile | 32 -- docker/php-nginx-dev/5.6/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../5.6/conf/bin/service.d/blackfire-agent.sh | 25 -- .../5.6/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../5.6/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../5.6/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.0/Dockerfile | 32 -- docker/php-nginx-dev/7.0/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.0/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../7.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.1-alpine/Dockerfile | 39 --- .../7.1-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.1/Dockerfile | 32 -- docker/php-nginx-dev/7.1/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.1/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.1/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../7.1/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.2-alpine/Dockerfile | 39 --- .../7.2-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.2/Dockerfile | 32 -- docker/php-nginx-dev/7.2/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.2/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.2/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.2/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../7.2/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.3-alpine/Dockerfile | 39 --- .../7.3-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.3/Dockerfile | 32 -- docker/php-nginx-dev/7.3/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.3/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.3/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../7.3/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.4-alpine/Dockerfile | 39 --- .../7.4-alpine/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/7.4/Dockerfile | 32 -- docker/php-nginx-dev/7.4/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../7.4/conf/bin/service.d/blackfire-agent.sh | 25 -- .../7.4/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../7.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../7.4/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/8.0-alpine/Dockerfile | 38 -- .../8.0-alpine/Dockerfile.jinja2 | 11 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../conf/bin/service.d/blackfire-agent.sh | 25 -- .../conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/8.0/Dockerfile | 32 -- docker/php-nginx-dev/8.0/Dockerfile.jinja2 | 12 - .../service.d/blackfire-agent.d/10-init.sh | 1 - .../8.0/conf/bin/service.d/blackfire-agent.sh | 25 -- .../8.0/conf/etc/nginx/conf.d/02-dev.conf | 1 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../etc/supervisor.d/blackfire-agent.conf | 14 - .../8.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 - .../8.0/conf/provision/bootstrap.d/10-php.sh | 24 -- .../bootstrap.d/20-php-module-blackfire.sh | 6 - .../bootstrap.d/20-php-module-opcache.sh | 11 - .../bootstrap.d/20-php-module-xdebug.sh | 33 -- .../provision/entrypoint.d/10-php-debugger.sh | 106 ------ .../provision/entrypoint.d/20-nginx-dev.sh | 7 - docker/php-nginx-dev/8.5-alpine/Dockerfile | 5 +- docker/php-nginx/5.6/Dockerfile | 28 -- docker/php-nginx/5.6/Dockerfile.jinja2 | 14 - .../5.6/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/5.6/conf/bin/service.d/nginx.sh | 10 - .../5.6/conf/etc/nginx/conf.d/.gitkeep | 0 .../5.6/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/5.6/conf/etc/nginx/global.conf | 1 - docker/php-nginx/5.6/conf/etc/nginx/main.conf | 4 - docker/php-nginx/5.6/conf/etc/nginx/php.conf | 1 - .../5.6/conf/etc/nginx/ssl/server.crt | 28 -- .../5.6/conf/etc/nginx/ssl/server.csr | 26 -- .../5.6/conf/etc/nginx/ssl/server.key | 51 --- .../5.6/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/5.6/conf/etc/nginx/vhost.conf | 28 -- .../5.6/conf/etc/nginx/vhost.ssl.conf | 6 - .../5.6/conf/etc/supervisor.d/nginx.conf | 14 - .../5.6/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../5.6/conf/provision/bootstrap.d/10-php.sh | 7 - .../5.6/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.0/Dockerfile | 28 -- docker/php-nginx/7.0/Dockerfile.jinja2 | 14 - .../7.0/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/7.0/conf/bin/service.d/nginx.sh | 10 - .../7.0/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.0/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/7.0/conf/etc/nginx/global.conf | 1 - docker/php-nginx/7.0/conf/etc/nginx/main.conf | 4 - docker/php-nginx/7.0/conf/etc/nginx/php.conf | 1 - .../7.0/conf/etc/nginx/ssl/server.crt | 28 -- .../7.0/conf/etc/nginx/ssl/server.csr | 26 -- .../7.0/conf/etc/nginx/ssl/server.key | 51 --- .../7.0/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/7.0/conf/etc/nginx/vhost.conf | 28 -- .../7.0/conf/etc/nginx/vhost.ssl.conf | 6 - .../7.0/conf/etc/supervisor.d/nginx.conf | 14 - .../7.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../7.0/conf/provision/bootstrap.d/10-php.sh | 7 - .../7.0/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.1-alpine/Dockerfile | 25 -- docker/php-nginx/7.1-alpine/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../7.1-alpine/conf/bin/service.d/nginx.sh | 10 - .../7.1-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../7.1-alpine/conf/etc/nginx/global.conf | 1 - .../7.1-alpine/conf/etc/nginx/main.conf | 4 - .../7.1-alpine/conf/etc/nginx/nginx.conf | 34 -- .../7.1-alpine/conf/etc/nginx/php.conf | 1 - .../7.1-alpine/conf/etc/nginx/ssl/server.crt | 28 -- .../7.1-alpine/conf/etc/nginx/ssl/server.csr | 26 -- .../7.1-alpine/conf/etc/nginx/ssl/server.key | 51 --- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../7.1-alpine/conf/etc/nginx/vhost.conf | 28 -- .../7.1-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.1/Dockerfile | 28 -- docker/php-nginx/7.1/Dockerfile.jinja2 | 14 - .../7.1/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/7.1/conf/bin/service.d/nginx.sh | 10 - .../7.1/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.1/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/7.1/conf/etc/nginx/global.conf | 1 - docker/php-nginx/7.1/conf/etc/nginx/main.conf | 4 - docker/php-nginx/7.1/conf/etc/nginx/php.conf | 1 - .../7.1/conf/etc/nginx/ssl/server.crt | 28 -- .../7.1/conf/etc/nginx/ssl/server.csr | 26 -- .../7.1/conf/etc/nginx/ssl/server.key | 51 --- .../7.1/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/7.1/conf/etc/nginx/vhost.conf | 28 -- .../7.1/conf/etc/nginx/vhost.ssl.conf | 6 - .../7.1/conf/etc/supervisor.d/nginx.conf | 14 - .../7.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../7.1/conf/provision/bootstrap.d/10-php.sh | 7 - .../7.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.2-alpine/Dockerfile | 25 -- docker/php-nginx/7.2-alpine/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../7.2-alpine/conf/bin/service.d/nginx.sh | 10 - .../7.2-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../7.2-alpine/conf/etc/nginx/global.conf | 1 - .../7.2-alpine/conf/etc/nginx/main.conf | 4 - .../7.2-alpine/conf/etc/nginx/nginx.conf | 34 -- .../7.2-alpine/conf/etc/nginx/php.conf | 1 - .../7.2-alpine/conf/etc/nginx/ssl/server.crt | 28 -- .../7.2-alpine/conf/etc/nginx/ssl/server.csr | 26 -- .../7.2-alpine/conf/etc/nginx/ssl/server.key | 51 --- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../7.2-alpine/conf/etc/nginx/vhost.conf | 28 -- .../7.2-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.2/Dockerfile | 28 -- docker/php-nginx/7.2/Dockerfile.jinja2 | 14 - .../7.2/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/7.2/conf/bin/service.d/nginx.sh | 10 - .../7.2/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.2/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/7.2/conf/etc/nginx/global.conf | 1 - docker/php-nginx/7.2/conf/etc/nginx/main.conf | 4 - docker/php-nginx/7.2/conf/etc/nginx/php.conf | 1 - .../7.2/conf/etc/nginx/ssl/server.crt | 28 -- .../7.2/conf/etc/nginx/ssl/server.csr | 26 -- .../7.2/conf/etc/nginx/ssl/server.key | 51 --- .../7.2/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/7.2/conf/etc/nginx/vhost.conf | 28 -- .../7.2/conf/etc/nginx/vhost.ssl.conf | 6 - .../7.2/conf/etc/supervisor.d/nginx.conf | 14 - .../7.2/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../7.2/conf/provision/bootstrap.d/10-php.sh | 7 - .../7.2/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.3-alpine/Dockerfile | 25 -- docker/php-nginx/7.3-alpine/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../7.3-alpine/conf/bin/service.d/nginx.sh | 10 - .../7.3-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../7.3-alpine/conf/etc/nginx/global.conf | 1 - .../7.3-alpine/conf/etc/nginx/main.conf | 4 - .../7.3-alpine/conf/etc/nginx/nginx.conf | 34 -- .../7.3-alpine/conf/etc/nginx/php.conf | 1 - .../7.3-alpine/conf/etc/nginx/ssl/server.crt | 28 -- .../7.3-alpine/conf/etc/nginx/ssl/server.csr | 26 -- .../7.3-alpine/conf/etc/nginx/ssl/server.key | 51 --- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../7.3-alpine/conf/etc/nginx/vhost.conf | 28 -- .../7.3-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.3/Dockerfile | 28 -- docker/php-nginx/7.3/Dockerfile.jinja2 | 14 - .../7.3/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/7.3/conf/bin/service.d/nginx.sh | 10 - .../7.3/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.3/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/7.3/conf/etc/nginx/global.conf | 1 - docker/php-nginx/7.3/conf/etc/nginx/main.conf | 4 - docker/php-nginx/7.3/conf/etc/nginx/php.conf | 1 - .../7.3/conf/etc/nginx/ssl/server.crt | 28 -- .../7.3/conf/etc/nginx/ssl/server.csr | 26 -- .../7.3/conf/etc/nginx/ssl/server.key | 51 --- .../7.3/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/7.3/conf/etc/nginx/vhost.conf | 28 -- .../7.3/conf/etc/nginx/vhost.ssl.conf | 6 - .../7.3/conf/etc/supervisor.d/nginx.conf | 14 - .../7.3/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../7.3/conf/provision/bootstrap.d/10-php.sh | 7 - .../7.3/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.4-alpine/Dockerfile | 25 -- docker/php-nginx/7.4-alpine/Dockerfile.jinja2 | 14 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../7.4-alpine/conf/bin/service.d/nginx.sh | 10 - .../7.4-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../7.4-alpine/conf/etc/nginx/global.conf | 1 - .../7.4-alpine/conf/etc/nginx/main.conf | 4 - .../7.4-alpine/conf/etc/nginx/nginx.conf | 34 -- .../7.4-alpine/conf/etc/nginx/php.conf | 1 - .../7.4-alpine/conf/etc/nginx/ssl/server.crt | 28 -- .../7.4-alpine/conf/etc/nginx/ssl/server.csr | 26 -- .../7.4-alpine/conf/etc/nginx/ssl/server.key | 51 --- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../7.4-alpine/conf/etc/nginx/vhost.conf | 28 -- .../7.4-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/7.4/Dockerfile | 28 -- docker/php-nginx/7.4/Dockerfile.jinja2 | 14 - .../7.4/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/7.4/conf/bin/service.d/nginx.sh | 10 - .../7.4/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.4/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/7.4/conf/etc/nginx/global.conf | 1 - docker/php-nginx/7.4/conf/etc/nginx/main.conf | 4 - docker/php-nginx/7.4/conf/etc/nginx/php.conf | 1 - .../7.4/conf/etc/nginx/ssl/server.crt | 28 -- .../7.4/conf/etc/nginx/ssl/server.csr | 26 -- .../7.4/conf/etc/nginx/ssl/server.key | 51 --- .../7.4/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/7.4/conf/etc/nginx/vhost.conf | 28 -- .../7.4/conf/etc/nginx/vhost.ssl.conf | 6 - .../7.4/conf/etc/supervisor.d/nginx.conf | 14 - .../7.4/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../7.4/conf/provision/bootstrap.d/10-php.sh | 7 - .../7.4/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/8.0-alpine/Dockerfile | 24 -- docker/php-nginx/8.0-alpine/Dockerfile.jinja2 | 13 - .../conf/bin/service.d/nginx.d/10-init.sh | 5 - .../8.0-alpine/conf/bin/service.d/nginx.sh | 10 - .../8.0-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 - .../8.0-alpine/conf/etc/nginx/global.conf | 1 - .../8.0-alpine/conf/etc/nginx/main.conf | 4 - .../8.0-alpine/conf/etc/nginx/nginx.conf | 34 -- .../8.0-alpine/conf/etc/nginx/php.conf | 1 - .../8.0-alpine/conf/etc/nginx/ssl/server.crt | 28 -- .../8.0-alpine/conf/etc/nginx/ssl/server.csr | 26 -- .../8.0-alpine/conf/etc/nginx/ssl/server.key | 51 --- .../conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../8.0-alpine/conf/etc/nginx/vhost.conf | 28 -- .../8.0-alpine/conf/etc/nginx/vhost.ssl.conf | 6 - .../conf/etc/supervisor.d/nginx.conf | 14 - .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../conf/provision/bootstrap.d/10-php.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-nginx/8.0/Dockerfile | 28 -- docker/php-nginx/8.0/Dockerfile.jinja2 | 14 - .../8.0/conf/bin/service.d/nginx.d/10-init.sh | 5 - .../php-nginx/8.0/conf/bin/service.d/nginx.sh | 10 - .../8.0/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.0/conf/etc/nginx/conf.d/10-php.conf | 3 - .../php-nginx/8.0/conf/etc/nginx/global.conf | 1 - docker/php-nginx/8.0/conf/etc/nginx/main.conf | 4 - docker/php-nginx/8.0/conf/etc/nginx/php.conf | 1 - .../8.0/conf/etc/nginx/ssl/server.crt | 28 -- .../8.0/conf/etc/nginx/ssl/server.csr | 26 -- .../8.0/conf/etc/nginx/ssl/server.key | 51 --- .../8.0/conf/etc/nginx/vhost.common.conf | 2 - .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 - .../vhost.common.d/10-location-root.conf | 3 - .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 - .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 - .../php-nginx/8.0/conf/etc/nginx/vhost.conf | 28 -- .../8.0/conf/etc/nginx/vhost.ssl.conf | 6 - .../8.0/conf/etc/supervisor.d/nginx.conf | 14 - .../8.0/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 -- .../8.0/conf/provision/bootstrap.d/10-php.sh | 7 - .../8.0/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 -- docker/php-official/5.6/Dockerfile | 220 ------------ docker/php-official/5.6/Dockerfile.jinja2 | 37 -- docker/php-official/5.6/conf/VERSION | 1 - docker/php-official/5.6/conf/bin/bootstrap.sh | 3 - docker/php-official/5.6/conf/bin/config.sh | 117 ------- docker/php-official/5.6/conf/bin/control.sh | 160 --------- .../5.6/conf/bin/entrypoint.d/cli.sh | 19 - .../5.6/conf/bin/entrypoint.d/default.sh | 3 - .../5.6/conf/bin/entrypoint.d/noop.sh | 7 - .../5.6/conf/bin/entrypoint.d/root.sh | 14 - .../5.6/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/5.6/conf/bin/entrypoint.sh | 46 --- docker/php-official/5.6/conf/bin/provision | 8 - docker/php-official/5.6/conf/bin/provision.py | 328 ------------------ .../5.6/conf/bin/service.d/cron.d/10-init.sh | 16 - .../5.6/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../5.6/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../5.6/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../5.6/conf/bin/service.d/postfix.sh | 42 --- .../5.6/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../5.6/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../5.6/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../5.6/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../5.6/conf/bin/usr-bin/docker-cronjob | 26 -- .../5.6/conf/bin/usr-bin/docker-php-setting | 44 --- .../5.6/conf/bin/usr-bin/docker-provision | 9 - .../5.6/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/5.6/conf/bin/usr-bin/service | 86 ----- .../5.6/conf/bin/usr-bin/version-compare | 43 --- .../php-official/5.6/conf/etc/cron/.gitkeep | 0 .../5.6/conf/etc/logrotate.d/php5-fpm | 12 - .../5.6/conf/etc/logrotate.d/syslog-ng | 38 -- .../5.6/conf/etc/php/conf.d/.gitkeep | 0 .../5.6/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/5.6/conf/etc/php/php.ini | 1 - .../5.6/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/5.6/conf/etc/supervisor.conf | 20 -- .../5.6/conf/etc/supervisor.d/.gitkeep | 0 .../5.6/conf/etc/supervisor.d/cron.conf | 14 - .../5.6/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../5.6/conf/etc/supervisor.d/php-fpm.conf | 15 - .../5.6/conf/etc/supervisor.d/postfix.conf | 15 - .../5.6/conf/etc/supervisor.d/ssh.conf | 14 - .../5.6/conf/etc/supervisor.d/syslog.conf | 13 - .../5.6/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../5.6/conf/provision/ansible.cfg | 0 .../5.6/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../5.6/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../5.6/conf/provision/build.d/.gitkeep | 0 .../5.6/conf/provision/build.d/10-cleanup.sh | 7 - .../5.6/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../5.6/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../5.6/conf/provision/onbuild.d/.gitkeep | 0 .../5.6/conf/provision/roles/.gitkeep | 0 .../5.6/conf/provision/service.d/.gitkeep | 0 .../5.6/conf/provision/service.d/cron.sh | 13 - .../5.6/conf/provision/service.d/dnsmasq.sh | 24 -- .../5.6/conf/provision/service.d/postfix.sh | 32 -- .../5.6/conf/provision/service.d/ssh.sh | 17 - .../5.6/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../5.6/conf/provision/variables.yml | 7 - docker/php-official/7.0/Dockerfile | 225 ------------ docker/php-official/7.0/Dockerfile.jinja2 | 37 -- docker/php-official/7.0/conf/VERSION | 1 - docker/php-official/7.0/conf/bin/bootstrap.sh | 3 - docker/php-official/7.0/conf/bin/config.sh | 117 ------- docker/php-official/7.0/conf/bin/control.sh | 160 --------- .../7.0/conf/bin/entrypoint.d/cli.sh | 19 - .../7.0/conf/bin/entrypoint.d/default.sh | 3 - .../7.0/conf/bin/entrypoint.d/noop.sh | 7 - .../7.0/conf/bin/entrypoint.d/root.sh | 14 - .../7.0/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/7.0/conf/bin/entrypoint.sh | 46 --- docker/php-official/7.0/conf/bin/provision | 8 - docker/php-official/7.0/conf/bin/provision.py | 328 ------------------ .../7.0/conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.0/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.0/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.0/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.0/conf/bin/service.d/postfix.sh | 42 --- .../7.0/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.0/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../7.0/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../7.0/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../7.0/conf/bin/usr-bin/docker-cronjob | 26 -- .../7.0/conf/bin/usr-bin/docker-php-setting | 44 --- .../7.0/conf/bin/usr-bin/docker-provision | 9 - .../7.0/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/7.0/conf/bin/usr-bin/service | 86 ----- .../7.0/conf/bin/usr-bin/version-compare | 43 --- .../php-official/7.0/conf/etc/cron/.gitkeep | 0 .../7.0/conf/etc/logrotate.d/php5-fpm | 12 - .../7.0/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.0/conf/etc/php/conf.d/.gitkeep | 0 .../7.0/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/7.0/conf/etc/php/php.ini | 1 - .../7.0/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/7.0/conf/etc/supervisor.conf | 20 -- .../7.0/conf/etc/supervisor.d/.gitkeep | 0 .../7.0/conf/etc/supervisor.d/cron.conf | 14 - .../7.0/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../7.0/conf/etc/supervisor.d/php-fpm.conf | 15 - .../7.0/conf/etc/supervisor.d/postfix.conf | 15 - .../7.0/conf/etc/supervisor.d/ssh.conf | 14 - .../7.0/conf/etc/supervisor.d/syslog.conf | 13 - .../7.0/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.0/conf/provision/ansible.cfg | 0 .../7.0/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../7.0/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../7.0/conf/provision/build.d/.gitkeep | 0 .../7.0/conf/provision/build.d/10-cleanup.sh | 7 - .../7.0/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../7.0/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../7.0/conf/provision/onbuild.d/.gitkeep | 0 .../7.0/conf/provision/roles/.gitkeep | 0 .../7.0/conf/provision/service.d/.gitkeep | 0 .../7.0/conf/provision/service.d/cron.sh | 13 - .../7.0/conf/provision/service.d/dnsmasq.sh | 24 -- .../7.0/conf/provision/service.d/postfix.sh | 32 -- .../7.0/conf/provision/service.d/ssh.sh | 17 - .../7.0/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.0/conf/provision/variables.yml | 7 - docker/php-official/7.1-alpine/Dockerfile | 241 ------------- .../php-official/7.1-alpine/Dockerfile.jinja2 | 38 -- docker/php-official/7.1-alpine/conf/VERSION | 1 - .../7.1-alpine/conf/bin/bootstrap.sh | 3 - .../7.1-alpine/conf/bin/config.sh | 117 ------- .../7.1-alpine/conf/bin/control.sh | 160 --------- .../7.1-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../7.1-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../7.1-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../7.1-alpine/conf/bin/entrypoint.sh | 46 --- .../7.1-alpine/conf/bin/provision | 8 - .../7.1-alpine/conf/bin/provision.py | 328 ------------------ .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.1-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.1-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.1-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.1-alpine/conf/bin/service.d/postfix.sh | 42 --- .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.1-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../conf/bin/usr-bin/docker-cronjob | 26 -- .../conf/bin/usr-bin/docker-php-setting | 44 --- .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../7.1-alpine/conf/bin/usr-bin/service | 86 ----- .../conf/bin/usr-bin/version-compare | 43 --- .../7.1-alpine/conf/etc/cron/.gitkeep | 0 .../7.1-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../7.1-alpine/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.1-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../7.1-alpine/conf/etc/php/fpm/.gitkeep | 0 .../7.1-alpine/conf/etc/php/php.ini | 1 - .../7.1-alpine/conf/etc/php/php.webdevops.ini | 34 -- .../7.1-alpine/conf/etc/supervisor.conf | 20 -- .../7.1-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../7.1-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.1-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../conf/provision/entrypoint.d/20-php.sh | 75 ---- .../conf/provision/onbuild.d/.gitkeep | 0 .../7.1-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 -- .../conf/provision/service.d/postfix.sh | 32 -- .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.1-alpine/conf/provision/variables.yml | 7 - docker/php-official/7.1/Dockerfile | 225 ------------ docker/php-official/7.1/Dockerfile.jinja2 | 37 -- docker/php-official/7.1/conf/VERSION | 1 - docker/php-official/7.1/conf/bin/bootstrap.sh | 3 - docker/php-official/7.1/conf/bin/config.sh | 117 ------- docker/php-official/7.1/conf/bin/control.sh | 160 --------- .../7.1/conf/bin/entrypoint.d/cli.sh | 19 - .../7.1/conf/bin/entrypoint.d/default.sh | 3 - .../7.1/conf/bin/entrypoint.d/noop.sh | 7 - .../7.1/conf/bin/entrypoint.d/root.sh | 14 - .../7.1/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/7.1/conf/bin/entrypoint.sh | 46 --- docker/php-official/7.1/conf/bin/provision | 8 - docker/php-official/7.1/conf/bin/provision.py | 328 ------------------ .../7.1/conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.1/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.1/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.1/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.1/conf/bin/service.d/postfix.sh | 42 --- .../7.1/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.1/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../7.1/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../7.1/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../7.1/conf/bin/usr-bin/docker-cronjob | 26 -- .../7.1/conf/bin/usr-bin/docker-php-setting | 44 --- .../7.1/conf/bin/usr-bin/docker-provision | 9 - .../7.1/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/7.1/conf/bin/usr-bin/service | 86 ----- .../7.1/conf/bin/usr-bin/version-compare | 43 --- .../php-official/7.1/conf/etc/cron/.gitkeep | 0 .../7.1/conf/etc/logrotate.d/php5-fpm | 12 - .../7.1/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.1/conf/etc/php/conf.d/.gitkeep | 0 .../7.1/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/7.1/conf/etc/php/php.ini | 1 - .../7.1/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/7.1/conf/etc/supervisor.conf | 20 -- .../7.1/conf/etc/supervisor.d/.gitkeep | 0 .../7.1/conf/etc/supervisor.d/cron.conf | 14 - .../7.1/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../7.1/conf/etc/supervisor.d/php-fpm.conf | 15 - .../7.1/conf/etc/supervisor.d/postfix.conf | 15 - .../7.1/conf/etc/supervisor.d/ssh.conf | 14 - .../7.1/conf/etc/supervisor.d/syslog.conf | 13 - .../7.1/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.1/conf/provision/ansible.cfg | 0 .../7.1/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../7.1/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../7.1/conf/provision/build.d/.gitkeep | 0 .../7.1/conf/provision/build.d/10-cleanup.sh | 7 - .../7.1/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../7.1/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../7.1/conf/provision/onbuild.d/.gitkeep | 0 .../7.1/conf/provision/roles/.gitkeep | 0 .../7.1/conf/provision/service.d/.gitkeep | 0 .../7.1/conf/provision/service.d/cron.sh | 13 - .../7.1/conf/provision/service.d/dnsmasq.sh | 24 -- .../7.1/conf/provision/service.d/postfix.sh | 32 -- .../7.1/conf/provision/service.d/ssh.sh | 17 - .../7.1/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.1/conf/provision/variables.yml | 7 - docker/php-official/7.2-alpine/Dockerfile | 245 ------------- .../php-official/7.2-alpine/Dockerfile.jinja2 | 38 -- docker/php-official/7.2-alpine/conf/VERSION | 1 - .../7.2-alpine/conf/bin/bootstrap.sh | 3 - .../7.2-alpine/conf/bin/config.sh | 117 ------- .../7.2-alpine/conf/bin/control.sh | 160 --------- .../7.2-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../7.2-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../7.2-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../7.2-alpine/conf/bin/entrypoint.sh | 46 --- .../7.2-alpine/conf/bin/provision | 8 - .../7.2-alpine/conf/bin/provision.py | 328 ------------------ .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.2-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.2-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.2-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.2-alpine/conf/bin/service.d/postfix.sh | 42 --- .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.2-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../conf/bin/usr-bin/docker-cronjob | 26 -- .../conf/bin/usr-bin/docker-php-setting | 44 --- .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../7.2-alpine/conf/bin/usr-bin/service | 86 ----- .../conf/bin/usr-bin/version-compare | 43 --- .../7.2-alpine/conf/etc/cron/.gitkeep | 0 .../7.2-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../7.2-alpine/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.2-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../7.2-alpine/conf/etc/php/fpm/.gitkeep | 0 .../7.2-alpine/conf/etc/php/php.ini | 1 - .../7.2-alpine/conf/etc/php/php.webdevops.ini | 34 -- .../7.2-alpine/conf/etc/supervisor.conf | 20 -- .../7.2-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../7.2-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.2-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../conf/provision/entrypoint.d/20-php.sh | 75 ---- .../conf/provision/onbuild.d/.gitkeep | 0 .../7.2-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 -- .../conf/provision/service.d/postfix.sh | 32 -- .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.2-alpine/conf/provision/variables.yml | 7 - docker/php-official/7.2/Dockerfile | 224 ------------ docker/php-official/7.2/Dockerfile.jinja2 | 37 -- docker/php-official/7.2/conf/VERSION | 1 - docker/php-official/7.2/conf/bin/bootstrap.sh | 3 - docker/php-official/7.2/conf/bin/config.sh | 117 ------- docker/php-official/7.2/conf/bin/control.sh | 160 --------- .../7.2/conf/bin/entrypoint.d/cli.sh | 19 - .../7.2/conf/bin/entrypoint.d/default.sh | 3 - .../7.2/conf/bin/entrypoint.d/noop.sh | 7 - .../7.2/conf/bin/entrypoint.d/root.sh | 14 - .../7.2/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/7.2/conf/bin/entrypoint.sh | 46 --- docker/php-official/7.2/conf/bin/provision | 8 - docker/php-official/7.2/conf/bin/provision.py | 328 ------------------ .../7.2/conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.2/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.2/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.2/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.2/conf/bin/service.d/postfix.sh | 42 --- .../7.2/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.2/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../7.2/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../7.2/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../7.2/conf/bin/usr-bin/docker-cronjob | 26 -- .../7.2/conf/bin/usr-bin/docker-php-setting | 44 --- .../7.2/conf/bin/usr-bin/docker-provision | 9 - .../7.2/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/7.2/conf/bin/usr-bin/service | 86 ----- .../7.2/conf/bin/usr-bin/version-compare | 43 --- .../php-official/7.2/conf/etc/cron/.gitkeep | 0 .../7.2/conf/etc/logrotate.d/php5-fpm | 12 - .../7.2/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.2/conf/etc/php/conf.d/.gitkeep | 0 .../7.2/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/7.2/conf/etc/php/php.ini | 1 - .../7.2/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/7.2/conf/etc/supervisor.conf | 20 -- .../7.2/conf/etc/supervisor.d/.gitkeep | 0 .../7.2/conf/etc/supervisor.d/cron.conf | 14 - .../7.2/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../7.2/conf/etc/supervisor.d/php-fpm.conf | 15 - .../7.2/conf/etc/supervisor.d/postfix.conf | 15 - .../7.2/conf/etc/supervisor.d/ssh.conf | 14 - .../7.2/conf/etc/supervisor.d/syslog.conf | 13 - .../7.2/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.2/conf/provision/ansible.cfg | 0 .../7.2/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../7.2/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../7.2/conf/provision/build.d/.gitkeep | 0 .../7.2/conf/provision/build.d/10-cleanup.sh | 7 - .../7.2/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../7.2/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../7.2/conf/provision/onbuild.d/.gitkeep | 0 .../7.2/conf/provision/roles/.gitkeep | 0 .../7.2/conf/provision/service.d/.gitkeep | 0 .../7.2/conf/provision/service.d/cron.sh | 13 - .../7.2/conf/provision/service.d/dnsmasq.sh | 24 -- .../7.2/conf/provision/service.d/postfix.sh | 32 -- .../7.2/conf/provision/service.d/ssh.sh | 17 - .../7.2/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.2/conf/provision/variables.yml | 7 - docker/php-official/7.3-alpine/Dockerfile | 245 ------------- .../php-official/7.3-alpine/Dockerfile.jinja2 | 38 -- docker/php-official/7.3-alpine/conf/VERSION | 1 - .../7.3-alpine/conf/bin/bootstrap.sh | 3 - .../7.3-alpine/conf/bin/config.sh | 117 ------- .../7.3-alpine/conf/bin/control.sh | 160 --------- .../7.3-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../7.3-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../7.3-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../7.3-alpine/conf/bin/entrypoint.sh | 46 --- .../7.3-alpine/conf/bin/provision | 8 - .../7.3-alpine/conf/bin/provision.py | 328 ------------------ .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.3-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.3-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.3-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.3-alpine/conf/bin/service.d/postfix.sh | 42 --- .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.3-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../conf/bin/usr-bin/docker-cronjob | 26 -- .../conf/bin/usr-bin/docker-php-setting | 44 --- .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../7.3-alpine/conf/bin/usr-bin/service | 86 ----- .../conf/bin/usr-bin/version-compare | 43 --- .../7.3-alpine/conf/etc/cron/.gitkeep | 0 .../7.3-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../7.3-alpine/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.3-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../7.3-alpine/conf/etc/php/fpm/.gitkeep | 0 .../7.3-alpine/conf/etc/php/php.ini | 1 - .../7.3-alpine/conf/etc/php/php.webdevops.ini | 34 -- .../7.3-alpine/conf/etc/supervisor.conf | 20 -- .../7.3-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../7.3-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.3-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../conf/provision/entrypoint.d/20-php.sh | 75 ---- .../conf/provision/onbuild.d/.gitkeep | 0 .../7.3-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 -- .../conf/provision/service.d/postfix.sh | 32 -- .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.3-alpine/conf/provision/variables.yml | 7 - docker/php-official/7.3/Dockerfile | 224 ------------ docker/php-official/7.3/Dockerfile.jinja2 | 37 -- docker/php-official/7.3/conf/VERSION | 1 - docker/php-official/7.3/conf/bin/bootstrap.sh | 3 - docker/php-official/7.3/conf/bin/config.sh | 117 ------- docker/php-official/7.3/conf/bin/control.sh | 160 --------- .../7.3/conf/bin/entrypoint.d/cli.sh | 19 - .../7.3/conf/bin/entrypoint.d/default.sh | 3 - .../7.3/conf/bin/entrypoint.d/noop.sh | 7 - .../7.3/conf/bin/entrypoint.d/root.sh | 14 - .../7.3/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/7.3/conf/bin/entrypoint.sh | 46 --- docker/php-official/7.3/conf/bin/provision | 8 - docker/php-official/7.3/conf/bin/provision.py | 328 ------------------ .../7.3/conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.3/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.3/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.3/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.3/conf/bin/service.d/postfix.sh | 42 --- .../7.3/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.3/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../7.3/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../7.3/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../7.3/conf/bin/usr-bin/docker-cronjob | 26 -- .../7.3/conf/bin/usr-bin/docker-php-setting | 44 --- .../7.3/conf/bin/usr-bin/docker-provision | 9 - .../7.3/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/7.3/conf/bin/usr-bin/service | 86 ----- .../7.3/conf/bin/usr-bin/version-compare | 43 --- .../php-official/7.3/conf/etc/cron/.gitkeep | 0 .../7.3/conf/etc/logrotate.d/php5-fpm | 12 - .../7.3/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.3/conf/etc/php/conf.d/.gitkeep | 0 .../7.3/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/7.3/conf/etc/php/php.ini | 1 - .../7.3/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/7.3/conf/etc/supervisor.conf | 20 -- .../7.3/conf/etc/supervisor.d/.gitkeep | 0 .../7.3/conf/etc/supervisor.d/cron.conf | 14 - .../7.3/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../7.3/conf/etc/supervisor.d/php-fpm.conf | 15 - .../7.3/conf/etc/supervisor.d/postfix.conf | 15 - .../7.3/conf/etc/supervisor.d/ssh.conf | 14 - .../7.3/conf/etc/supervisor.d/syslog.conf | 13 - .../7.3/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.3/conf/provision/ansible.cfg | 0 .../7.3/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../7.3/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../7.3/conf/provision/build.d/.gitkeep | 0 .../7.3/conf/provision/build.d/10-cleanup.sh | 7 - .../7.3/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../7.3/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../7.3/conf/provision/onbuild.d/.gitkeep | 0 .../7.3/conf/provision/roles/.gitkeep | 0 .../7.3/conf/provision/service.d/.gitkeep | 0 .../7.3/conf/provision/service.d/cron.sh | 13 - .../7.3/conf/provision/service.d/dnsmasq.sh | 24 -- .../7.3/conf/provision/service.d/postfix.sh | 32 -- .../7.3/conf/provision/service.d/ssh.sh | 17 - .../7.3/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.3/conf/provision/variables.yml | 7 - docker/php-official/7.4-alpine/Dockerfile | 248 ------------- .../php-official/7.4-alpine/Dockerfile.jinja2 | 38 -- docker/php-official/7.4-alpine/conf/VERSION | 1 - .../7.4-alpine/conf/bin/bootstrap.sh | 3 - .../7.4-alpine/conf/bin/config.sh | 117 ------- .../7.4-alpine/conf/bin/control.sh | 160 --------- .../7.4-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../7.4-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../7.4-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../7.4-alpine/conf/bin/entrypoint.sh | 46 --- .../7.4-alpine/conf/bin/provision | 8 - .../7.4-alpine/conf/bin/provision.py | 328 ------------------ .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.4-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.4-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.4-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.4-alpine/conf/bin/service.d/postfix.sh | 42 --- .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.4-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../conf/bin/usr-bin/docker-cronjob | 26 -- .../conf/bin/usr-bin/docker-php-setting | 44 --- .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../7.4-alpine/conf/bin/usr-bin/service | 86 ----- .../conf/bin/usr-bin/version-compare | 43 --- .../7.4-alpine/conf/etc/cron/.gitkeep | 0 .../7.4-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../7.4-alpine/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.4-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../7.4-alpine/conf/etc/php/fpm/.gitkeep | 0 .../7.4-alpine/conf/etc/php/php.ini | 1 - .../7.4-alpine/conf/etc/php/php.webdevops.ini | 34 -- .../7.4-alpine/conf/etc/supervisor.conf | 20 -- .../7.4-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../7.4-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.4-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../conf/provision/entrypoint.d/20-php.sh | 75 ---- .../conf/provision/onbuild.d/.gitkeep | 0 .../7.4-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 -- .../conf/provision/service.d/postfix.sh | 32 -- .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.4-alpine/conf/provision/variables.yml | 7 - docker/php-official/7.4/Dockerfile | 224 ------------ docker/php-official/7.4/Dockerfile.jinja2 | 37 -- docker/php-official/7.4/conf/VERSION | 1 - docker/php-official/7.4/conf/bin/bootstrap.sh | 3 - docker/php-official/7.4/conf/bin/config.sh | 117 ------- docker/php-official/7.4/conf/bin/control.sh | 160 --------- .../7.4/conf/bin/entrypoint.d/cli.sh | 19 - .../7.4/conf/bin/entrypoint.d/default.sh | 3 - .../7.4/conf/bin/entrypoint.d/noop.sh | 7 - .../7.4/conf/bin/entrypoint.d/root.sh | 14 - .../7.4/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/7.4/conf/bin/entrypoint.sh | 46 --- docker/php-official/7.4/conf/bin/provision | 8 - docker/php-official/7.4/conf/bin/provision.py | 328 ------------------ .../7.4/conf/bin/service.d/cron.d/10-init.sh | 16 - .../7.4/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../7.4/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../7.4/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../7.4/conf/bin/service.d/postfix.sh | 42 --- .../7.4/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../7.4/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../7.4/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../7.4/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../7.4/conf/bin/usr-bin/docker-cronjob | 26 -- .../7.4/conf/bin/usr-bin/docker-php-setting | 44 --- .../7.4/conf/bin/usr-bin/docker-provision | 9 - .../7.4/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/7.4/conf/bin/usr-bin/service | 86 ----- .../7.4/conf/bin/usr-bin/version-compare | 43 --- .../php-official/7.4/conf/etc/cron/.gitkeep | 0 .../7.4/conf/etc/logrotate.d/php5-fpm | 12 - .../7.4/conf/etc/logrotate.d/syslog-ng | 38 -- .../7.4/conf/etc/php/conf.d/.gitkeep | 0 .../7.4/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/7.4/conf/etc/php/php.ini | 1 - .../7.4/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/7.4/conf/etc/supervisor.conf | 20 -- .../7.4/conf/etc/supervisor.d/.gitkeep | 0 .../7.4/conf/etc/supervisor.d/cron.conf | 14 - .../7.4/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../7.4/conf/etc/supervisor.d/php-fpm.conf | 15 - .../7.4/conf/etc/supervisor.d/postfix.conf | 15 - .../7.4/conf/etc/supervisor.d/ssh.conf | 14 - .../7.4/conf/etc/supervisor.d/syslog.conf | 13 - .../7.4/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../7.4/conf/provision/ansible.cfg | 0 .../7.4/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../7.4/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../7.4/conf/provision/build.d/.gitkeep | 0 .../7.4/conf/provision/build.d/10-cleanup.sh | 7 - .../7.4/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../7.4/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../7.4/conf/provision/onbuild.d/.gitkeep | 0 .../7.4/conf/provision/roles/.gitkeep | 0 .../7.4/conf/provision/service.d/.gitkeep | 0 .../7.4/conf/provision/service.d/cron.sh | 13 - .../7.4/conf/provision/service.d/dnsmasq.sh | 24 -- .../7.4/conf/provision/service.d/postfix.sh | 32 -- .../7.4/conf/provision/service.d/ssh.sh | 17 - .../7.4/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../7.4/conf/provision/variables.yml | 7 - docker/php-official/8.0-alpine/Dockerfile | 254 -------------- .../php-official/8.0-alpine/Dockerfile.jinja2 | 38 -- docker/php-official/8.0-alpine/conf/VERSION | 1 - .../8.0-alpine/conf/bin/bootstrap.sh | 3 - .../8.0-alpine/conf/bin/config.sh | 117 ------- .../8.0-alpine/conf/bin/control.sh | 160 --------- .../8.0-alpine/conf/bin/entrypoint.d/cli.sh | 19 - .../conf/bin/entrypoint.d/default.sh | 3 - .../8.0-alpine/conf/bin/entrypoint.d/noop.sh | 7 - .../8.0-alpine/conf/bin/entrypoint.d/root.sh | 14 - .../conf/bin/entrypoint.d/supervisord.sh | 9 - .../8.0-alpine/conf/bin/entrypoint.sh | 46 --- .../8.0-alpine/conf/bin/provision | 8 - .../8.0-alpine/conf/bin/provision.py | 328 ------------------ .../conf/bin/service.d/cron.d/10-init.sh | 16 - .../8.0-alpine/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../8.0-alpine/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../8.0-alpine/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../8.0-alpine/conf/bin/service.d/postfix.sh | 42 --- .../conf/bin/service.d/ssh.d/10-init.sh | 7 - .../8.0-alpine/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../conf/bin/usr-bin/docker-cronjob | 26 -- .../conf/bin/usr-bin/docker-php-setting | 44 --- .../conf/bin/usr-bin/docker-provision | 9 - .../conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../8.0-alpine/conf/bin/usr-bin/service | 86 ----- .../conf/bin/usr-bin/version-compare | 43 --- .../8.0-alpine/conf/etc/cron/.gitkeep | 0 .../8.0-alpine/conf/etc/logrotate.d/php5-fpm | 12 - .../8.0-alpine/conf/etc/logrotate.d/syslog-ng | 38 -- .../8.0-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.0-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.0-alpine/conf/etc/php/php.ini | 1 - .../8.0-alpine/conf/etc/php/php.webdevops.ini | 34 -- .../8.0-alpine/conf/etc/supervisor.conf | 20 -- .../8.0-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 - .../conf/etc/supervisor.d/php-fpm.conf | 15 - .../conf/etc/supervisor.d/postfix.conf | 15 - .../8.0-alpine/conf/etc/supervisor.d/ssh.conf | 14 - .../conf/etc/supervisor.d/syslog.conf | 13 - .../conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../8.0-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 8 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 - .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../conf/provision/entrypoint.d/20-php.sh | 75 ---- .../conf/provision/onbuild.d/.gitkeep | 0 .../8.0-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 - .../conf/provision/service.d/dnsmasq.sh | 24 -- .../conf/provision/service.d/postfix.sh | 32 -- .../conf/provision/service.d/ssh.sh | 17 - .../conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../8.0-alpine/conf/provision/variables.yml | 7 - docker/php-official/8.0/Dockerfile | 229 ------------ docker/php-official/8.0/Dockerfile.jinja2 | 37 -- docker/php-official/8.0/conf/VERSION | 1 - docker/php-official/8.0/conf/bin/bootstrap.sh | 3 - docker/php-official/8.0/conf/bin/config.sh | 117 ------- docker/php-official/8.0/conf/bin/control.sh | 160 --------- .../8.0/conf/bin/entrypoint.d/cli.sh | 19 - .../8.0/conf/bin/entrypoint.d/default.sh | 3 - .../8.0/conf/bin/entrypoint.d/noop.sh | 7 - .../8.0/conf/bin/entrypoint.d/root.sh | 14 - .../8.0/conf/bin/entrypoint.d/supervisord.sh | 9 - .../php-official/8.0/conf/bin/entrypoint.sh | 46 --- docker/php-official/8.0/conf/bin/provision | 8 - docker/php-official/8.0/conf/bin/provision.py | 328 ------------------ .../8.0/conf/bin/service.d/cron.d/10-init.sh | 16 - .../8.0/conf/bin/service.d/cron.sh | 10 - .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 -- .../8.0/conf/bin/service.d/dnsmasq.sh | 11 - .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 - .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 -- .../8.0/conf/bin/service.d/php-fpm.sh | 10 - .../conf/bin/service.d/postfix.d/10-init.sh | 30 -- .../8.0/conf/bin/service.d/postfix.sh | 42 --- .../8.0/conf/bin/service.d/ssh.d/10-init.sh | 7 - .../8.0/conf/bin/service.d/ssh.sh | 10 - .../bin/service.d/supervisor.d/10-init.sh | 1 - .../8.0/conf/bin/service.d/supervisor.sh | 11 - .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 - .../8.0/conf/bin/service.d/syslog-ng.sh | 10 - .../bin/usr-bin/container-file-auto-restore | 26 -- .../conf/bin/usr-bin/docker-ansible-install | 77 ---- .../8.0/conf/bin/usr-bin/docker-cronjob | 26 -- .../8.0/conf/bin/usr-bin/docker-php-setting | 44 --- .../8.0/conf/bin/usr-bin/docker-provision | 9 - .../8.0/conf/bin/usr-bin/docker-service | 89 ----- .../conf/bin/usr-bin/docker-service-disable | 3 - .../conf/bin/usr-bin/docker-service-enable | 4 - .../php-official/8.0/conf/bin/usr-bin/service | 86 ----- .../8.0/conf/bin/usr-bin/version-compare | 43 --- .../php-official/8.0/conf/etc/cron/.gitkeep | 0 .../8.0/conf/etc/logrotate.d/php5-fpm | 12 - .../8.0/conf/etc/logrotate.d/syslog-ng | 38 -- .../8.0/conf/etc/php/conf.d/.gitkeep | 0 .../8.0/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.0/conf/etc/php/php.ini | 1 - .../8.0/conf/etc/php/php.webdevops.ini | 34 -- .../php-official/8.0/conf/etc/supervisor.conf | 20 -- .../8.0/conf/etc/supervisor.d/.gitkeep | 0 .../8.0/conf/etc/supervisor.d/cron.conf | 14 - .../8.0/conf/etc/supervisor.d/dnsmasq.conf | 14 - .../8.0/conf/etc/supervisor.d/php-fpm.conf | 15 - .../8.0/conf/etc/supervisor.d/postfix.conf | 15 - .../8.0/conf/etc/supervisor.d/ssh.conf | 14 - .../8.0/conf/etc/supervisor.d/syslog.conf | 13 - .../8.0/conf/etc/syslog-ng/syslog-ng.conf | 48 --- .../8.0/conf/provision/ansible.cfg | 0 .../8.0/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 - .../provision/bootstrap.d/10-permissions.sh | 2 - .../conf/provision/bootstrap.d/10-php-init.sh | 4 - .../provision/bootstrap.d/10-supervisor.sh | 10 - .../bootstrap.d/10-user-application.sh | 10 - .../conf/provision/bootstrap.d/11-php-conf.sh | 10 - .../8.0/conf/provision/bootstrap.d/20-app.sh | 5 - .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 --- .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 --- .../provision/bootstrap.d/20-setup-php.sh | 11 - .../provision/bootstrap.d/30-setup-ioncube.sh | 50 --- .../conf/provision/bootstrap.d/90-cleanup.sh | 12 - .../8.0/conf/provision/build.d/.gitkeep | 0 .../8.0/conf/provision/build.d/10-cleanup.sh | 7 - .../8.0/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 - .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 ----- .../8.0/conf/provision/entrypoint.d/20-php.sh | 75 ---- .../8.0/conf/provision/onbuild.d/.gitkeep | 0 .../8.0/conf/provision/roles/.gitkeep | 0 .../8.0/conf/provision/service.d/.gitkeep | 0 .../8.0/conf/provision/service.d/cron.sh | 13 - .../8.0/conf/provision/service.d/dnsmasq.sh | 24 -- .../8.0/conf/provision/service.d/postfix.sh | 32 -- .../8.0/conf/provision/service.d/ssh.sh | 17 - .../8.0/conf/provision/service.d/syslog.sh | 41 --- .../conf/provision/variables-webdevops.yml | 7 - .../8.0/conf/provision/variables.yml | 7 - docker/php-official/8.1-alpine/Dockerfile | 2 +- docker/php-official/8.1/Dockerfile | 2 +- docker/php/5.6 | 1 - template/Dockerfile/images/php.jinja2 | 140 +------- 2172 files changed, 19 insertions(+), 48457 deletions(-) delete mode 100644 docker/php-apache-dev/5.6/Dockerfile delete mode 100644 docker/php-apache-dev/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.0/Dockerfile delete mode 100644 docker/php-apache-dev/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.1/Dockerfile delete mode 100644 docker/php-apache-dev/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.2/Dockerfile delete mode 100644 docker/php-apache-dev/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.3/Dockerfile delete mode 100644 docker/php-apache-dev/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/7.4/Dockerfile delete mode 100644 docker/php-apache-dev/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/Dockerfile delete mode 100644 docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache-dev/8.0/Dockerfile delete mode 100644 docker/php-apache-dev/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf delete mode 100644 docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh delete mode 100644 docker/php-apache/5.6/Dockerfile delete mode 100644 docker/php-apache/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/5.6/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/5.6/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/5.6/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.0/Dockerfile delete mode 100644 docker/php-apache/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.0/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.1-alpine/Dockerfile delete mode 100644 docker/php-apache/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.1/Dockerfile delete mode 100644 docker/php-apache/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.1/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.2-alpine/Dockerfile delete mode 100644 docker/php-apache/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.2/Dockerfile delete mode 100644 docker/php-apache/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.2/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.2/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.2/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.3-alpine/Dockerfile delete mode 100644 docker/php-apache/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.3/Dockerfile delete mode 100644 docker/php-apache/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.3/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.3/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.3/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.4-alpine/Dockerfile delete mode 100644 docker/php-apache/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/7.4/Dockerfile delete mode 100644 docker/php-apache/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/7.4/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/7.4/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/7.4/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/8.0-alpine/Dockerfile delete mode 100644 docker/php-apache/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-apache/8.0/Dockerfile delete mode 100644 docker/php-apache/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh delete mode 100644 docker/php-apache/8.0/conf/bin/service.d/httpd.sh delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/conf.d/.gitkeep delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/global.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/main.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/php.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/ssl/server.key delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/.gitkeep delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/vhost.conf delete mode 100644 docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf delete mode 100644 docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf delete mode 100644 docker/php-apache/8.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh delete mode 100644 docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-apache/8.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh delete mode 100644 docker/php-dev/5.6/Dockerfile delete mode 100644 docker/php-dev/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.0/Dockerfile delete mode 100644 docker/php-dev/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.1-alpine/Dockerfile delete mode 100644 docker/php-dev/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.1/Dockerfile delete mode 100644 docker/php-dev/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.2-alpine/Dockerfile delete mode 100644 docker/php-dev/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.2/Dockerfile delete mode 100644 docker/php-dev/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.3-alpine/Dockerfile delete mode 100644 docker/php-dev/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.3/Dockerfile delete mode 100644 docker/php-dev/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.4-alpine/Dockerfile delete mode 100644 docker/php-dev/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/7.4/Dockerfile delete mode 100644 docker/php-dev/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/8.0-alpine/Dockerfile delete mode 100644 docker/php-dev/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-dev/8.0/Dockerfile delete mode 100644 docker/php-dev/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh delete mode 100644 docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh delete mode 100644 docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/5.6/Dockerfile delete mode 100644 docker/php-nginx-dev/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.0/Dockerfile delete mode 100644 docker/php-nginx-dev/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.1/Dockerfile delete mode 100644 docker/php-nginx-dev/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.2/Dockerfile delete mode 100644 docker/php-nginx-dev/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.3/Dockerfile delete mode 100644 docker/php-nginx-dev/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/7.4/Dockerfile delete mode 100644 docker/php-nginx-dev/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/Dockerfile delete mode 100644 docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx-dev/8.0/Dockerfile delete mode 100644 docker/php-nginx-dev/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf delete mode 100644 docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh delete mode 100644 docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh delete mode 100644 docker/php-nginx/5.6/Dockerfile delete mode 100644 docker/php-nginx/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/5.6/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/5.6/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/5.6/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.0/Dockerfile delete mode 100644 docker/php-nginx/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.0/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.1-alpine/Dockerfile delete mode 100644 docker/php-nginx/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.1/Dockerfile delete mode 100644 docker/php-nginx/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.1/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.2-alpine/Dockerfile delete mode 100644 docker/php-nginx/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.2/Dockerfile delete mode 100644 docker/php-nginx/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.2/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.2/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.2/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.2/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.2/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.3-alpine/Dockerfile delete mode 100644 docker/php-nginx/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.3/Dockerfile delete mode 100644 docker/php-nginx/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.3/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.3/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.3/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.3/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.3/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.3/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.3/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.4-alpine/Dockerfile delete mode 100644 docker/php-nginx/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/7.4/Dockerfile delete mode 100644 docker/php-nginx/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/7.4/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/7.4/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/7.4/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/7.4/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/7.4/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/7.4/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/7.4/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/8.0-alpine/Dockerfile delete mode 100644 docker/php-nginx/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/nginx.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-nginx/8.0/Dockerfile delete mode 100644 docker/php-nginx/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-nginx/8.0/conf/bin/service.d/nginx.d/10-init.sh delete mode 100644 docker/php-nginx/8.0/conf/bin/service.d/nginx.sh delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/conf.d/.gitkeep delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/conf.d/10-php.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/global.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/main.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/php.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/ssl/server.crt delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/ssl/server.csr delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/ssl/server.key delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/.gitkeep delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-general.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-location-root.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-log.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-php.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf delete mode 100644 docker/php-nginx/8.0/conf/etc/supervisor.d/nginx.conf delete mode 100644 docker/php-nginx/8.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh delete mode 100644 docker/php-nginx/8.0/conf/provision/bootstrap.d/10-php.sh delete mode 100644 docker/php-nginx/8.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-nginx/8.0/conf/provision/entrypoint.d/20-nginx.sh delete mode 100644 docker/php-official/5.6/Dockerfile delete mode 100644 docker/php-official/5.6/Dockerfile.jinja2 delete mode 100644 docker/php-official/5.6/conf/VERSION delete mode 100644 docker/php-official/5.6/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/5.6/conf/bin/config.sh delete mode 100644 docker/php-official/5.6/conf/bin/control.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/5.6/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/5.6/conf/bin/provision delete mode 100755 docker/php-official/5.6/conf/bin/provision.py delete mode 100644 docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/5.6/conf/bin/usr-bin/service delete mode 100644 docker/php-official/5.6/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/5.6/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/5.6/conf/etc/php/php.ini delete mode 100644 docker/php-official/5.6/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/5.6/conf/provision/ansible.cfg delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/5.6/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/5.6/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/5.6/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/5.6/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/5.6/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/5.6/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/5.6/conf/provision/variables.yml delete mode 100644 docker/php-official/7.0/Dockerfile delete mode 100644 docker/php-official/7.0/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.0/conf/VERSION delete mode 100644 docker/php-official/7.0/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.0/conf/bin/config.sh delete mode 100644 docker/php-official/7.0/conf/bin/control.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.0/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.0/conf/bin/provision delete mode 100755 docker/php-official/7.0/conf/bin/provision.py delete mode 100644 docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.0/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.0/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.0/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.0/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.0/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.0/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.0/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.0/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.0/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.0/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.0/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.0/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.0/conf/provision/variables.yml delete mode 100644 docker/php-official/7.1-alpine/Dockerfile delete mode 100644 docker/php-official/7.1-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.1-alpine/conf/VERSION delete mode 100644 docker/php-official/7.1-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.1-alpine/conf/bin/provision delete mode 100755 docker/php-official/7.1-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.1-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.1-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.1-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.1-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.1-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.1-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.1-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.1-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.1-alpine/conf/provision/variables.yml delete mode 100644 docker/php-official/7.1/Dockerfile delete mode 100644 docker/php-official/7.1/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.1/conf/VERSION delete mode 100644 docker/php-official/7.1/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.1/conf/bin/config.sh delete mode 100644 docker/php-official/7.1/conf/bin/control.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.1/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.1/conf/bin/provision delete mode 100755 docker/php-official/7.1/conf/bin/provision.py delete mode 100644 docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.1/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.1/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.1/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.1/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.1/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.1/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.1/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.1/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.1/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.1/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.1/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.1/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.1/conf/provision/variables.yml delete mode 100644 docker/php-official/7.2-alpine/Dockerfile delete mode 100644 docker/php-official/7.2-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.2-alpine/conf/VERSION delete mode 100644 docker/php-official/7.2-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.2-alpine/conf/bin/provision delete mode 100755 docker/php-official/7.2-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.2-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.2-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.2-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.2-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.2-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.2-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.2-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.2-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.2-alpine/conf/provision/variables.yml delete mode 100644 docker/php-official/7.2/Dockerfile delete mode 100644 docker/php-official/7.2/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.2/conf/VERSION delete mode 100644 docker/php-official/7.2/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.2/conf/bin/config.sh delete mode 100644 docker/php-official/7.2/conf/bin/control.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.2/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.2/conf/bin/provision delete mode 100755 docker/php-official/7.2/conf/bin/provision.py delete mode 100644 docker/php-official/7.2/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.2/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.2/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.2/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.2/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.2/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.2/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.2/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.2/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.2/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.2/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.2/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.2/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.2/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.2/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.2/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.2/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.2/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.2/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.2/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.2/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.2/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.2/conf/provision/variables.yml delete mode 100644 docker/php-official/7.3-alpine/Dockerfile delete mode 100644 docker/php-official/7.3-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.3-alpine/conf/VERSION delete mode 100644 docker/php-official/7.3-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.3-alpine/conf/bin/provision delete mode 100755 docker/php-official/7.3-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.3-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.3-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.3-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.3-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.3-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.3-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.3-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.3-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.3-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.3-alpine/conf/provision/variables.yml delete mode 100644 docker/php-official/7.3/Dockerfile delete mode 100644 docker/php-official/7.3/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.3/conf/VERSION delete mode 100644 docker/php-official/7.3/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.3/conf/bin/config.sh delete mode 100644 docker/php-official/7.3/conf/bin/control.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.3/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.3/conf/bin/provision delete mode 100755 docker/php-official/7.3/conf/bin/provision.py delete mode 100644 docker/php-official/7.3/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.3/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.3/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.3/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.3/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.3/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.3/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.3/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.3/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.3/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.3/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.3/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.3/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.3/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.3/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.3/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.3/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.3/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.3/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.3/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.3/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.3/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.3/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.3/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.3/conf/provision/variables.yml delete mode 100644 docker/php-official/7.4-alpine/Dockerfile delete mode 100644 docker/php-official/7.4-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.4-alpine/conf/VERSION delete mode 100644 docker/php-official/7.4-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.4-alpine/conf/bin/provision delete mode 100755 docker/php-official/7.4-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.4-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.4-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.4-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.4-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.4-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.4-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.4-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.4-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.4-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.4-alpine/conf/provision/variables.yml delete mode 100644 docker/php-official/7.4/Dockerfile delete mode 100644 docker/php-official/7.4/Dockerfile.jinja2 delete mode 100644 docker/php-official/7.4/conf/VERSION delete mode 100644 docker/php-official/7.4/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/7.4/conf/bin/config.sh delete mode 100644 docker/php-official/7.4/conf/bin/control.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/7.4/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/7.4/conf/bin/provision delete mode 100755 docker/php-official/7.4/conf/bin/provision.py delete mode 100644 docker/php-official/7.4/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/7.4/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/7.4/conf/bin/usr-bin/service delete mode 100644 docker/php-official/7.4/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/7.4/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/7.4/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/7.4/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/7.4/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/7.4/conf/etc/php/php.ini delete mode 100644 docker/php-official/7.4/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/7.4/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/7.4/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/7.4/conf/provision/ansible.cfg delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/7.4/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/7.4/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/7.4/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/7.4/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/7.4/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/7.4/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/7.4/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/7.4/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/7.4/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.4/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.4/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/7.4/conf/provision/variables.yml delete mode 100644 docker/php-official/8.0-alpine/Dockerfile delete mode 100644 docker/php-official/8.0-alpine/Dockerfile.jinja2 delete mode 100644 docker/php-official/8.0-alpine/conf/VERSION delete mode 100644 docker/php-official/8.0-alpine/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/config.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/control.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/8.0-alpine/conf/bin/provision delete mode 100755 docker/php-official/8.0-alpine/conf/bin/provision.py delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/8.0-alpine/conf/bin/usr-bin/service delete mode 100644 docker/php-official/8.0-alpine/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/8.0-alpine/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/8.0-alpine/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/8.0-alpine/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/etc/php/php.ini delete mode 100644 docker/php-official/8.0-alpine/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/8.0-alpine/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/8.0-alpine/conf/provision/ansible.cfg delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/8.0-alpine/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/8.0-alpine/conf/provision/variables.yml delete mode 100644 docker/php-official/8.0/Dockerfile delete mode 100644 docker/php-official/8.0/Dockerfile.jinja2 delete mode 100644 docker/php-official/8.0/conf/VERSION delete mode 100644 docker/php-official/8.0/conf/bin/bootstrap.sh delete mode 100644 docker/php-official/8.0/conf/bin/config.sh delete mode 100644 docker/php-official/8.0/conf/bin/control.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.d/cli.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.d/default.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.d/noop.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.d/root.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.d/supervisord.sh delete mode 100644 docker/php-official/8.0/conf/bin/entrypoint.sh delete mode 100755 docker/php-official/8.0/conf/bin/provision delete mode 100755 docker/php-official/8.0/conf/bin/provision.py delete mode 100644 docker/php-official/8.0/conf/bin/service.d/cron.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/cron.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/dnsmasq.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/php-fpm.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/php-fpm.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/postfix.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/postfix.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/ssh.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/supervisor.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/supervisor.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/syslog-ng.d/10-init.sh delete mode 100644 docker/php-official/8.0/conf/bin/service.d/syslog-ng.sh delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/container-file-auto-restore delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-ansible-install delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-cronjob delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-php-setting delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-service delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-service-disable delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/docker-service-enable delete mode 100755 docker/php-official/8.0/conf/bin/usr-bin/service delete mode 100644 docker/php-official/8.0/conf/bin/usr-bin/version-compare delete mode 100644 docker/php-official/8.0/conf/etc/cron/.gitkeep delete mode 100644 docker/php-official/8.0/conf/etc/logrotate.d/php5-fpm delete mode 100644 docker/php-official/8.0/conf/etc/logrotate.d/syslog-ng delete mode 100644 docker/php-official/8.0/conf/etc/php/conf.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/etc/php/fpm/.gitkeep delete mode 100644 docker/php-official/8.0/conf/etc/php/php.ini delete mode 100644 docker/php-official/8.0/conf/etc/php/php.webdevops.ini delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/cron.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/postfix.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/ssh.conf delete mode 100644 docker/php-official/8.0/conf/etc/supervisor.d/syslog.conf delete mode 100644 docker/php-official/8.0/conf/etc/syslog-ng/syslog-ng.conf delete mode 100644 docker/php-official/8.0/conf/provision/ansible.cfg delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/10-entrypoint.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/10-permissions.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/10-php-init.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/10-supervisor.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/10-user-application.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/11-php-conf.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/20-app.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh delete mode 100644 docker/php-official/8.0/conf/provision/bootstrap.d/90-cleanup.sh delete mode 100644 docker/php-official/8.0/conf/provision/build.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/build.d/10-cleanup.sh delete mode 100644 docker/php-official/8.0/conf/provision/entrypoint.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/entrypoint.d/05-permissions.sh delete mode 100644 docker/php-official/8.0/conf/provision/entrypoint.d/20-php-fpm.sh delete mode 100644 docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh delete mode 100644 docker/php-official/8.0/conf/provision/onbuild.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/roles/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/service.d/.gitkeep delete mode 100644 docker/php-official/8.0/conf/provision/service.d/cron.sh delete mode 100644 docker/php-official/8.0/conf/provision/service.d/dnsmasq.sh delete mode 100644 docker/php-official/8.0/conf/provision/service.d/postfix.sh delete mode 100644 docker/php-official/8.0/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/8.0/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/8.0/conf/provision/variables-webdevops.yml delete mode 100644 docker/php-official/8.0/conf/provision/variables.yml delete mode 120000 docker/php/5.6 diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile deleted file mode 100644 index 44de9a194..000000000 --- a/docker/php-apache-dev/5.6/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:5.6 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/5.6/Dockerfile.jinja2 b/docker/php-apache-dev/5.6/Dockerfile.jinja2 deleted file mode 100644 index 8ab1976a9..000000000 --- a/docker/php-apache-dev/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "5.6") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="5.6") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile deleted file mode 100644 index 636680b78..000000000 --- a/docker/php-apache-dev/7.0/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile.jinja2 b/docker/php-apache-dev/7.0/Dockerfile.jinja2 deleted file mode 100644 index 476b9f009..000000000 --- a/docker/php-apache-dev/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile deleted file mode 100644 index 61af6c5a2..000000000 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index db426431b..000000000 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile deleted file mode 100644 index 30b9940f2..000000000 --- a/docker/php-apache-dev/7.1/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile.jinja2 b/docker/php-apache-dev/7.1/Dockerfile.jinja2 deleted file mode 100644 index dfce87d70..000000000 --- a/docker/php-apache-dev/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile deleted file mode 100644 index 549a651b4..000000000 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.2-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index e89c70b13..000000000 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.2-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile deleted file mode 100644 index 7940bb2de..000000000 --- a/docker/php-apache-dev/7.2/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.2 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile.jinja2 b/docker/php-apache-dev/7.2/Dockerfile.jinja2 deleted file mode 100644 index 47eaa3a98..000000000 --- a/docker/php-apache-dev/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.2") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.2/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.2/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile deleted file mode 100644 index 342570707..000000000 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.3-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index de49b5af5..000000000 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.3-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile deleted file mode 100644 index 8b26ff0ce..000000000 --- a/docker/php-apache-dev/7.3/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.3 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile.jinja2 b/docker/php-apache-dev/7.3/Dockerfile.jinja2 deleted file mode 100644 index 92b911b81..000000000 --- a/docker/php-apache-dev/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.3") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.3/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.3/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile deleted file mode 100644 index 5fa32afe4..000000000 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.4-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-3.1.6 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index 1bd2244da..000000000 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.4-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile deleted file mode 100644 index b9aa2deea..000000000 --- a/docker/php-apache-dev/7.4/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:7.4 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-3.1.6 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile.jinja2 b/docker/php-apache-dev/7.4/Dockerfile.jinja2 deleted file mode 100644 index 608ae77e6..000000000 --- a/docker/php-apache-dev/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "7.4") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/7.4/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/7.4/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile deleted file mode 100644 index 281dd770e..000000000 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:8.0-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index a0050e801..000000000 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ -{{ docker.from("php-apache", "8.0-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile deleted file mode 100644 index 81859cc64..000000000 --- a/docker/php-apache-dev/8.0/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-apache:8.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2 deleted file mode 100644 index c326cb319..000000000 --- a/docker/php-apache-dev/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-apache", "8.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf deleted file mode 100644 index 75e5f4396..000000000 --- a/docker/php-apache-dev/8.0/conf/etc/httpd/conf.d/02-dev.conf +++ /dev/null @@ -1,8 +0,0 @@ -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -EnableSendfile off - -LogLevel info diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf deleted file mode 100644 index 54918ec2b..000000000 --- a/docker/php-apache-dev/8.0/conf/etc/httpd/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,10 +0,0 @@ -"> - FileETag None - - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - diff --git a/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh deleted file mode 100644 index a9d2c6e92..000000000 --- a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/20-apache-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -go-replace \ - -s "" -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty diff --git a/docker/php-apache-dev/8.5-alpine/Dockerfile b/docker/php-apache-dev/8.5-alpine/Dockerfile index 37e099787..02781dc8b 100644 --- a/docker/php-apache-dev/8.5-alpine/Dockerfile +++ b/docker/php-apache-dev/8.5-alpine/Dockerfile @@ -24,10 +24,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile deleted file mode 100644 index 814756aaf..000000000 --- a/docker/php-apache/5.6/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:5.6 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 deleted file mode 100644 index c5a340291..000000000 --- a/docker/php-apache/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "5.6") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/5.6/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/5.6/conf/etc/httpd/global.conf b/docker/php-apache/5.6/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/5.6/conf/etc/httpd/main.conf b/docker/php-apache/5.6/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/5.6/conf/etc/httpd/php.conf b/docker/php-apache/5.6/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf b/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/5.6/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/5.6/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/5.6/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile deleted file mode 100644 index b64dd568a..000000000 --- a/docker/php-apache/7.0/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 deleted file mode 100644 index 4e656bcc4..000000000 --- a/docker/php-apache/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/7.0/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.0/conf/etc/httpd/global.conf b/docker/php-apache/7.0/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.0/conf/etc/httpd/main.conf b/docker/php-apache/7.0/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.0/conf/etc/httpd/php.conf b/docker/php-apache/7.0/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.0/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile deleted file mode 100644 index 75b10d69a..000000000 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index b4b06a628..000000000 --- a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.1-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.1-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile deleted file mode 100644 index edf258c27..000000000 --- a/docker/php-apache/7.1/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 deleted file mode 100644 index fdec6e0a6..000000000 --- a/docker/php-apache/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/7.1/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.1/conf/etc/httpd/global.conf b/docker/php-apache/7.1/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.1/conf/etc/httpd/main.conf b/docker/php-apache/7.1/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.1/conf/etc/httpd/php.conf b/docker/php-apache/7.1/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.1/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile deleted file mode 100644 index 331543c16..000000000 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index 9088053de..000000000 --- a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.2-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.2-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.2-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile deleted file mode 100644 index 97007693d..000000000 --- a/docker/php-apache/7.2/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.2/Dockerfile.jinja2 b/docker/php-apache/7.2/Dockerfile.jinja2 deleted file mode 100644 index acc3b1cb5..000000000 --- a/docker/php-apache/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.2") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.2/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.2/conf/bin/service.d/httpd.sh b/docker/php-apache/7.2/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/7.2/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.2/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.2/conf/etc/httpd/global.conf b/docker/php-apache/7.2/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.2/conf/etc/httpd/main.conf b/docker/php-apache/7.2/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.2/conf/etc/httpd/php.conf b/docker/php-apache/7.2/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.2/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.2/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.2/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.2/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.2/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.2/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile deleted file mode 100644 index 91f909b3a..000000000 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index 0a5d39962..000000000 --- a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.3-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.3-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.3-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.3-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile deleted file mode 100644 index fd714a495..000000000 --- a/docker/php-apache/7.3/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.3/Dockerfile.jinja2 b/docker/php-apache/7.3/Dockerfile.jinja2 deleted file mode 100644 index d9056be53..000000000 --- a/docker/php-apache/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.3") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.3/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.3/conf/bin/service.d/httpd.sh b/docker/php-apache/7.3/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/7.3/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.3/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.3/conf/etc/httpd/global.conf b/docker/php-apache/7.3/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.3/conf/etc/httpd/main.conf b/docker/php-apache/7.3/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.3/conf/etc/httpd/php.conf b/docker/php-apache/7.3/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.3/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.3/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.3/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.3/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.3/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.3/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile deleted file mode 100644 index 8f408c631..000000000 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index aec341e3e..000000000 --- a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.4-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/7.4-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.4-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.4-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.4-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile deleted file mode 100644 index 68581a393..000000000 --- a/docker/php-apache/7.4/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/7.4/Dockerfile.jinja2 b/docker/php-apache/7.4/Dockerfile.jinja2 deleted file mode 100644 index c909b094e..000000000 --- a/docker/php-apache/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "7.4") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/7.4/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/7.4/conf/bin/service.d/httpd.sh b/docker/php-apache/7.4/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/7.4/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.4/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/7.4/conf/etc/httpd/global.conf b/docker/php-apache/7.4/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.4/conf/etc/httpd/main.conf b/docker/php-apache/7.4/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/7.4/conf/etc/httpd/php.conf b/docker/php-apache/7.4/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/7.4/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/7.4/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/7.4/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/7.4/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/7.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/7.4/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/7.4/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile deleted file mode 100644 index 02f34eae9..000000000 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apk-install \ - apache2 \ - apache2-ctl \ - apache2-utils \ - apache2-proxy \ - apache2-ssl \ - # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) - && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap - -EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 5c7635476..000000000 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php", "8.0-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh deleted file mode 100644 index f88544c62..000000000 --- a/docker/php-apache/8.0-alpine/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/httpd/httpd.pid - -exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/8.0-alpine/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/8.0-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/8.0-alpine/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile deleted file mode 100644 index 490718e17..000000000 --- a/docker/php-apache/8.0/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install apache - && apt-install \ - apache2 \ - && sed -ri ' \ - s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ - s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ - ' /etc/apache2/apache2.conf \ - && rm -f /etc/apache2/sites-enabled/* \ - && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-apache/8.0/Dockerfile.jinja2 b/docker/php-apache/8.0/Dockerfile.jinja2 deleted file mode 100644 index 8b5669e52..000000000 --- a/docker/php-apache/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "8.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ apache.debian9() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh deleted file mode 100644 index 4ef318a1e..000000000 --- a/docker/php-apache/8.0/conf/bin/service.d/httpd.d/10-init.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi - diff --git a/docker/php-apache/8.0/conf/bin/service.d/httpd.sh b/docker/php-apache/8.0/conf/bin/service.d/httpd.sh deleted file mode 100644 index 1d871e7ea..000000000 --- a/docker/php-apache/8.0/conf/bin/service.d/httpd.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/httpd.d/" - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2*.pid - -source /etc/apache2/envvars -exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.0/conf/etc/httpd/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf deleted file mode 100644 index ebabf87e4..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-error-document.conf +++ /dev/null @@ -1,15 +0,0 @@ -####################################### -# Faster error documents -####################################### - - ErrorDocument 400 "400 Bad Request" - ErrorDocument 401 "401 Unauthorized" - ErrorDocument 403 "403 Forbidden" - ErrorDocument 404 "404 Not Found" - ErrorDocument 405 "405 Method Not Allowed" - - ErrorDocument 500 "500 Internal Server Error" - ErrorDocument 501 "501 Not Implemented" - ErrorDocument 502 "502 Bad Gateway" - ErrorDocument 503 "503 Service Unavailable" - diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf deleted file mode 100644 index 950e45105..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-log.conf +++ /dev/null @@ -1,4 +0,0 @@ -LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog -LogLevel warn -CustomLog /docker.stdout dockerlog -ErrorLog /docker.stderr diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf deleted file mode 100644 index cd62792e2..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-php.conf +++ /dev/null @@ -1,37 +0,0 @@ -############################# -# mod_proxy_fcgi -# official solution -# apache 2.4 and later -############################# - - - > - ProxySet connectiontimeout=5 timeout= - - - - SetHandler "proxy:fcgi://" - - - -############################# -# mod_fastcgi -# apaache 2.2 and 2.4 -############################# - - - AddHandler php-fcgi .php - Action php-fcgi /php-fcgi - Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout - - - - Allow from all - - = 2.4> - Require all granted - - - - diff --git a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf deleted file mode 100644 index 80b971734..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/conf.d/10-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -TimeOut 1000 -ServerName "" - -DirectoryIndex -DocumentRoot "" - -"> - Options FollowSymLinks - AllowOverride All - - - Allow from all - - = 2.4> - Require all granted - - diff --git a/docker/php-apache/8.0/conf/etc/httpd/global.conf b/docker/php-apache/8.0/conf/etc/httpd/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.0/conf/etc/httpd/main.conf b/docker/php-apache/8.0/conf/etc/httpd/main.conf deleted file mode 100644 index fb04614ca..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/main.conf +++ /dev/null @@ -1,10 +0,0 @@ -Include /opt/docker/etc/httpd/global.conf -Include /opt/docker/etc/httpd/php.conf - - - Include /opt/docker/etc/httpd/conf.d/*.conf - -= 2.4> - IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf - -Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.0/conf/etc/httpd/php.conf b/docker/php-apache/8.0/conf/etc/httpd/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf deleted file mode 100644 index 384696b4e..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.conf +++ /dev/null @@ -1,7 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.conf deleted file mode 100644 index c04a94318..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/vhost.conf +++ /dev/null @@ -1,36 +0,0 @@ -####################################### -# Vhost -####################################### - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - - - - ServerName docker.vm - ServerAlias - DocumentRoot "" - - UseCanonicalName Off - - - Include /opt/docker/etc/httpd/vhost.common.d/*.conf - - = 2.4> - IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf - - - Include /opt/docker/etc/httpd/vhost.ssl.conf - diff --git a/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf deleted file mode 100644 index cf5fbc604..000000000 --- a/docker/php-apache/8.0/conf/etc/httpd/vhost.ssl.conf +++ /dev/null @@ -1,26 +0,0 @@ - ############ - # SSL - ############ - - SSLEngine on - SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt - SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key - - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - # MSIE 7 and newer should be able to use keepalive - # This regexp is ok with 17-9! - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - ## SSL Hardening - SSLProtocol All -SSLv2 -SSLv3 - SSLHonorCipherOrder on - SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf deleted file mode 100644 index 12a6f86f7..000000000 --- a/docker/php-apache/8.0/conf/etc/supervisor.d/apache.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:apache] -programs=apached -priority=20 - -[program:apached] -command = /opt/docker/bin/service.d/httpd.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh deleted file mode 100644 index e9feb08b4..000000000 --- a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-apache.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) -IMAGE_DISTRIBUTION=$(docker-image-info dist) -IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) -IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') - -# Collect environment variables -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf - ;; - - RedHat) - APACHE_MAIN_PATH=/etc/httpd/ - APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf - ;; - - Alpine) - APACHE_MAIN_PATH=/etc/apache2/ - APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf - ;; -esac - -# Enable apache main config -ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" - -# Ensure /var/run/apache2 exists -mkdir -p -- "/var/run/apache2" - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - mkdir -p -- "/run/apache2" -fi - -# Maintain lock directory -if [[ "$IMAGE_FAMILY" == "Debian" ]]; then - mkdir -p -- "/var/lock/apache2" - chmod 0750 -- "/var/lock/apache2" - chown www-data:www-data -- "/var/lock/apache2" -fi - -APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') - -# Change log to Docker stdout -go-replace --regex --regex-backrefs \ - -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ - -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ - --path="$APACHE_MAIN_PATH" \ - --path-regex='(.*\.conf|default.*|.*log)$' - -# Switch MPM to event -if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -- /etc/httpd/conf.modules.d/00-mpm.conf -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then - a2enmod mpm_event -fi - -if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - go-replace --mode=line --regex --regex-backrefs \ - -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ - -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ - -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ - -- /etc/apache2/httpd.conf \ - /etc/apache2/conf.d/ssl.conf \ - /etc/apache2/conf.d/proxy.conf - - # Remove default vhost - sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf -fi - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/httpd/ssl -find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index c8669ca25..000000000 --- a/docker/php-apache/8.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - diff --git a/docker/php-apache/8.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh deleted file mode 100644 index 42ef48932..000000000 --- a/docker/php-apache/8.0/conf/provision/entrypoint.d/20-apache.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf -fi diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile deleted file mode 100644 index d50fc9119..000000000 --- a/docker/php-dev/5.6/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:5.6 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 deleted file mode 100644 index 2784a4e3c..000000000 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "5.6") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="5.6") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile deleted file mode 100644 index 50493be84..000000000 --- a/docker/php-dev/7.0/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.0 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 deleted file mode 100644 index d7a9901b7..000000000 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.0") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile deleted file mode 100644 index b4f890907..000000000 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index 2e48ff0f9..000000000 --- a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.1-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile deleted file mode 100644 index a61271bba..000000000 --- a/docker/php-dev/7.1/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 deleted file mode 100644 index 86f846804..000000000 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.1") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile deleted file mode 100644 index bf657a0ec..000000000 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index 7fd85c2c1..000000000 --- a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.2-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile deleted file mode 100644 index 3f314262b..000000000 --- a/docker/php-dev/7.2/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile.jinja2 b/docker/php-dev/7.2/Dockerfile.jinja2 deleted file mode 100644 index 7a89a2e2a..000000000 --- a/docker/php-dev/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.2") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.2/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile deleted file mode 100644 index 18c274d7f..000000000 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index c67e711c0..000000000 --- a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.3-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.3-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile deleted file mode 100644 index f979076ae..000000000 --- a/docker/php-dev/7.3/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile.jinja2 b/docker/php-dev/7.3/Dockerfile.jinja2 deleted file mode 100644 index 54a1dcc8c..000000000 --- a/docker/php-dev/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.3") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.3/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.3/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile deleted file mode 100644 index 5ace59447..000000000 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-3.1.6 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index 9724ff1e6..000000000 --- a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.4-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.4-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile deleted file mode 100644 index de0af30b1..000000000 --- a/docker/php-dev/7.4/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-3.1.6 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile.jinja2 b/docker/php-dev/7.4/Dockerfile.jinja2 deleted file mode 100644 index c7a70850b..000000000 --- a/docker/php-dev/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "7.4") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/7.4/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/7.4/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile deleted file mode 100644 index efdabcf39..000000000 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0-alpine - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index b46bc25ec..000000000 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("php", "8.0-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/8.0-alpine/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile deleted file mode 100644 index 8b5b7b7b1..000000000 --- a/docker/php-dev/8.0/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0 - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2 deleted file mode 100644 index f4c82a53c..000000000 --- a/docker/php-dev/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "8.0") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-dev/8.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh deleted file mode 100644 index 2502ab3e3..000000000 --- a/docker/php-dev/8.0/conf/bin/service.d/ssh.d/99-development.sh +++ /dev/null @@ -1,3 +0,0 @@ - -# Allow root access via ssh -go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh deleted file mode 100644 index 7fc8cca55..000000000 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/99-development.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Set passwords to "dev" -echo "$APPLICATION_USER":"dev" | chpasswd -echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/8.5-alpine/Dockerfile b/docker/php-dev/8.5-alpine/Dockerfile index dd401c67c..b6c94d659 100644 --- a/docker/php-dev/8.5-alpine/Dockerfile +++ b/docker/php-dev/8.5-alpine/Dockerfile @@ -16,10 +16,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile deleted file mode 100644 index f3ebc15a0..000000000 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:5.6 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 deleted file mode 100644 index ab94282f7..000000000 --- a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "5.6") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="5.6") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile deleted file mode 100644 index b8b261614..000000000 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 deleted file mode 100644 index 0594efaf9..000000000 --- a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile deleted file mode 100644 index 7bd194c90..000000000 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index 150eb99f9..000000000 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile deleted file mode 100644 index 2d2fa13aa..000000000 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-2.8.1 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 deleted file mode 100644 index ad48cc80c..000000000 --- a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile deleted file mode 100644 index 8c95f8456..000000000 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.2-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index 1d7722c61..000000000 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.2-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile deleted file mode 100644 index 243e76c8d..000000000 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.2 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2/Dockerfile.jinja2 deleted file mode 100644 index 70534778c..000000000 --- a/docker/php-nginx-dev/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.2") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.2/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.2/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.2/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile deleted file mode 100644 index 8cc518281..000000000 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.3-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index 3192db11a..000000000 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.3-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile deleted file mode 100644 index ea30f1500..000000000 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.3 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3/Dockerfile.jinja2 deleted file mode 100644 index 014aa1162..000000000 --- a/docker/php-nginx-dev/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.3") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.3/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.3/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.3/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile deleted file mode 100644 index 34dcb6570..000000000 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.4-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-3.1.6 \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index 18cd03bed..000000000 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.4-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile deleted file mode 100644 index f4f2395e5..000000000 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:7.4 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug-3.1.6 \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4/Dockerfile.jinja2 deleted file mode 100644 index ef32fba4e..000000000 --- a/docker/php-nginx-dev/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "7.4") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="7.4") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/7.4/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/7.4/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/7.4/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile deleted file mode 100644 index baa6de93a..000000000 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:8.0-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && apk-install \ - linux-headers \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 42ca8087f..000000000 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ -{{ docker.from("php-nginx", "8.0-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile deleted file mode 100644 index fb86aaae0..000000000 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:8.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install development environment - && BLACKFIRE_INSTALL_METHOD=raw bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ - && blackfire php:install \ - && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ - && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ - && apt-install tideways-php tideways-daemon \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - # Enable php development services - && docker-service enable syslog \ - && docker-service enable postfix \ - && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 deleted file mode 100644 index 3ca36395d..000000000 --- a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +0,0 @@ -{{ docker.from("php-nginx", "8.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.webDevelopment() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopment(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh deleted file mode 100644 index 95daa01ae..000000000 --- a/docker/php-nginx-dev/8.0/conf/bin/service.d/blackfire-agent.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi - -source /opt/docker/bin/config.sh - -BLACKFIRE_ARGS="" - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -# blackfire.server_id -if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" -fi - -# blackfire.server_token -if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then - BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" -fi - -# create directory for unix socket -mkdir -p /var/run/blackfire - -eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-nginx-dev/8.0/conf/etc/nginx/conf.d/02-dev.conf +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf deleted file mode 100644 index 4f80ec9d3..000000000 --- a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/02-dev.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* { - expires off; - add_header Cache-Control private; - - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index a2cd929e7..000000000 --- a/docker/php-nginx-dev/8.0/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf deleted file mode 100644 index 897831ddb..000000000 --- a/docker/php-nginx-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:blackfire-agent] -programs=blackfire-agentd -priority=25 - -[program:blackfire-agentd] -command = /opt/docker/bin/service.d/blackfire-agent.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index b6100c8f1..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable sendfile for nginx (eg. nfs usage) -go-replace --mode=lineinfile --regex \ - -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ - -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 852567f85..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) - -# Configure php-fpm -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf \ - /opt/docker/etc/php/fpm/php-fpm.conf - -fi diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh deleted file mode 100644 index f4ea7f72e..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Disable blackfire by default -rm -f \ - /etc/php5/cli/conf.d/zz-blackfire.ini \ - /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh deleted file mode 100644 index 079e59fdf..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Configure opcache for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ - -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ - -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ - -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ - -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ - -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh deleted file mode 100644 index e76310003..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Alpine) - # Fix php xdebug module [Alpine family] - - if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php5/conf.d/xdebug.ini - fi - - if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then - go-replace --mode=lineinfile \ - -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ - /etc/php7/conf.d/xdebug.ini - fi - - ;; -esac - -# Configure xdebug for development -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ - -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ - -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ - -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ - -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ - -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh deleted file mode 100644 index 7b392587c..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -################################################# -# Debugger switch -################################################# - -PHP_CONF_PATHS=" -/etc/php5/conf.d -/etc/php7/conf.d -/etc/php.d -/etc/php5/mods-available -/etc/php5/cli/conf.d -/etc/php5/cli/conf.d -/etc/php5/fpm/conf.d -/etc/php5/fpm/conf.d -/etc/php/7.0/mods-available -/etc/php/7.1/mods-available -/etc/php/7.2/mods-available -/etc/php/7.3/mods-available -/etc/php/7.4/mods-available -/etc/php/7.0/cli/conf.d -/etc/php/7.1/cli/conf.d -/etc/php/7.2/cli/conf.d -/etc/php/7.3/cli/conf.d -/etc/php/7.4/cli/conf.d -/etc/php/7.0/fpm/conf.d -/etc/php/7.1/fpm/conf.d -/etc/php/7.2/fpm/conf.d -/etc/php/7.3/fpm/conf.d -/etc/php/7.4/fpm/conf.d -/usr/local/etc/php/conf.d/" - -function phpModuleRemove() { - if [ "$#" -ne 1 ]; then - echo "You must specify the name of the PHP module which you want to disable" - exit 1 - fi - - echo " - Removing PHP module ${1}" - for CONF_PATH in $PHP_CONF_PATHS; do - rm -f "${CONF_PATH}"/*"${1}".ini - done -} - - -if [[ -n "${PHP_DEBUGGER+x}" ]]; then - case "$PHP_DEBUGGER" in - xdebug) - echo "PHP-Debugger: Xdebug enabled" - phpModuleRemove "blackfire" - ;; - - blackfire) - echo "PHP-Debugger: Blackfire enabled" - phpModuleRemove "xdebug" - docker-service-enable blackfire-agent - ;; - - none) - echo "PHP-Debugger: none" - phpModuleRemove "blackfire" - phpModuleRemove "xdebug" - ;; - esac - -else - - echo "PHP-Debugger: not specified - default is xdebug" - phpModuleRemove "blackfire" - -fi - -################################################# -# PHP debugger environment variables -################################################# - -function phpEnvironmentVariable() { - PHP_INI_KEY="$1" - PHP_ENV_NAME="$2" - - if [[ -n "${!PHP_ENV_NAME+x}" ]]; then - PHP_ENV_VALUE="${!PHP_ENV_NAME}" - echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini - fi -} - -################### -# XDEBUG -################### - -# xdebug3 remote debugger -phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" -phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" -phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" -phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" -phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" - -# xdebug3 profiler -phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" - -################### -# BLACKFIRE -################### -phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" -phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh deleted file mode 100644 index f4695f059..000000000 --- a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/20-nginx-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-nginx-dev/8.5-alpine/Dockerfile b/docker/php-nginx-dev/8.5-alpine/Dockerfile index ba94eeecf..c10f3d35b 100644 --- a/docker/php-nginx-dev/8.5-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.5-alpine/Dockerfile @@ -24,10 +24,7 @@ RUN set -x \ make \ autoconf \ g++ \ - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ + && pecl install xdebug \ && apk del -f --purge \ autoconf \ linux-headers \ diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile deleted file mode 100644 index ef79e5347..000000000 --- a/docker/php-nginx/5.6/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:5.6 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 deleted file mode 100644 index 0093f5432..000000000 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "5.6") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/global.conf b/docker/php-nginx/5.6/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/5.6/conf/etc/nginx/main.conf b/docker/php-nginx/5.6/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/php.conf b/docker/php-nginx/5.6/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/5.6/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/5.6/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/5.6/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile deleted file mode 100644 index f75346d8e..000000000 --- a/docker/php-nginx/7.0/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 deleted file mode 100644 index 39af76493..000000000 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/global.conf b/docker/php-nginx/7.0/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.0/conf/etc/nginx/main.conf b/docker/php-nginx/7.0/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/php.conf b/docker/php-nginx/7.0/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.0/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile deleted file mode 100644 index 541e7747a..000000000 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index fd23f8f8a..000000000 --- a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.1-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.1-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.1-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.1-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile deleted file mode 100644 index eb2376a9f..000000000 --- a/docker/php-nginx/7.1/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.1 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 deleted file mode 100644 index 0d89f2e50..000000000 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.1") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/global.conf b/docker/php-nginx/7.1/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.1/conf/etc/nginx/main.conf b/docker/php-nginx/7.1/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/php.conf b/docker/php-nginx/7.1/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.1/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile deleted file mode 100644 index 56cb3cf59..000000000 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index 6801b1d54..000000000 --- a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.2-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.2-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.2-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.2-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile deleted file mode 100644 index 2e77b6cfb..000000000 --- a/docker/php-nginx/7.2/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.2 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2 deleted file mode 100644 index d977be809..000000000 --- a/docker/php-nginx/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.2") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.2/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.2/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.2/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.2/conf/etc/nginx/global.conf b/docker/php-nginx/7.2/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.2/conf/etc/nginx/main.conf b/docker/php-nginx/7.2/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/php.conf b/docker/php-nginx/7.2/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.2/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.2/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.2/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.2/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.2/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.2/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.2/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.2/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.2/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile deleted file mode 100644 index 34093bb49..000000000 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index f15b17152..000000000 --- a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.3-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.3-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.3-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.3-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.3-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile deleted file mode 100644 index 959f94d73..000000000 --- a/docker/php-nginx/7.3/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.3 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.3/Dockerfile.jinja2 b/docker/php-nginx/7.3/Dockerfile.jinja2 deleted file mode 100644 index e92b76797..000000000 --- a/docker/php-nginx/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.3") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.3/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.3/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.3/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.3/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.3/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.3/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.3/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.3/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.3/conf/etc/nginx/global.conf b/docker/php-nginx/7.3/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.3/conf/etc/nginx/main.conf b/docker/php-nginx/7.3/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/php.conf b/docker/php-nginx/7.3/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.3/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.3/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.3/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.3/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.3/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.3/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.3/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.3/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile deleted file mode 100644 index e796d76ad..000000000 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index b698bdf63..000000000 --- a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.4-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.4-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.4-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.4-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.4-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile deleted file mode 100644 index f30b9c00c..000000000 --- a/docker/php-nginx/7.4/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:7.4 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/7.4/Dockerfile.jinja2 b/docker/php-nginx/7.4/Dockerfile.jinja2 deleted file mode 100644 index 27fee4a33..000000000 --- a/docker/php-nginx/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "7.4") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.4/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.4/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/7.4/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/7.4/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.4/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/7.4/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/7.4/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.4/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.4/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/7.4/conf/etc/nginx/global.conf b/docker/php-nginx/7.4/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.4/conf/etc/nginx/main.conf b/docker/php-nginx/7.4/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/php.conf b/docker/php-nginx/7.4/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/7.4/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.4/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/7.4/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/7.4/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/7.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/7.4/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/7.4/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/7.4/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/7.4/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile deleted file mode 100644 index 251eed71f..000000000 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0-alpine - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && apk-install \ - nginx \ - && docker-run-bootstrap - -EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 1115c6dd3..000000000 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("php", "8.0-alpine") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/8.0-alpine/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/nginx.conf deleted file mode 100644 index b9cb4ebc4..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/nginx.conf +++ /dev/null @@ -1,34 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /docker.stdout; -pid /run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /docker.stdout main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.0-alpine/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/8.0-alpine/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/8.0-alpine/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile deleted file mode 100644 index d9a1e55b8..000000000 --- a/docker/php-nginx/8.0/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php:8.0 - -ENV WEB_DOCUMENT_ROOT=/app \ - WEB_DOCUMENT_INDEX=index.php \ - WEB_ALIAS_DOMAIN=*.vm \ - WEB_PHP_TIMEOUT=600 \ - WEB_PHP_SOCKET="" -ENV WEB_PHP_SOCKET=127.0.0.1:9000 -ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ - >> /etc/apt/sources.list \ - && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ - && apt-install \ - nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup - -EXPOSE 80 443 diff --git a/docker/php-nginx/8.0/Dockerfile.jinja2 b/docker/php-nginx/8.0/Dockerfile.jinja2 deleted file mode 100644 index 53801851b..000000000 --- a/docker/php-nginx/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +0,0 @@ -{{ docker.from("php", "8.0") }} - -{{ environment.web() }} -{{ environment.webPhp() }} -{{ environment.nginx() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ nginx.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.0/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.0/conf/bin/service.d/nginx.d/10-init.sh deleted file mode 100644 index 8acb5111d..000000000 --- a/docker/php-nginx/8.0/conf/bin/service.d/nginx.d/10-init.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then - echo "" - echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" - echo "" -fi diff --git a/docker/php-nginx/8.0/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.0/conf/bin/service.d/nginx.sh deleted file mode 100644 index 3517c72a5..000000000 --- a/docker/php-nginx/8.0/conf/bin/service.d/nginx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/nginx.d/" - -exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.0/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.0/conf/etc/nginx/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.0/conf/etc/nginx/conf.d/10-php.conf deleted file mode 100644 index 9abe45f0a..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/conf.d/10-php.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream php { - server ; -} diff --git a/docker/php-nginx/8.0/conf/etc/nginx/global.conf b/docker/php-nginx/8.0/conf/etc/nginx/global.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/global.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.0/conf/etc/nginx/main.conf b/docker/php-nginx/8.0/conf/etc/nginx/main.conf deleted file mode 100644 index 06de0651b..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -include /opt/docker/etc/nginx/global.conf; -include /opt/docker/etc/nginx/php.conf; -include /opt/docker/etc/nginx/conf.d/*.conf; -include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/php.conf b/docker/php-nginx/8.0/conf/etc/nginx/php.conf deleted file mode 100644 index b6141db09..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/php.conf +++ /dev/null @@ -1 +0,0 @@ -# deprecated diff --git a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.crt deleted file mode 100644 index 6b0694907..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE -b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw -WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx -DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK -3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G -Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 -9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy -0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S -NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ -FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx -7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD -clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 -GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH -6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq -Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB -CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY -SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS -t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN -NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw -I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA -aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq -vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q -nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP -4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN -VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 -ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.csr deleted file mode 100644 index 8a9909f77..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.csr +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD -VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg -713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm -Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw -BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 -ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB -Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP -ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ -SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi -/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt -K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z -kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh -hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA -A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 -Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX -/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B -JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 -uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ -UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca -TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 -6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx -C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 -7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 -2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.key deleted file mode 100644 index c9eec145f..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/ssl/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik -9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE -LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K -Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw -uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy -COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 -hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA -lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo -S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq -lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp -MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA -AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc -OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp -m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP -OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg -tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ -F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH -NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf -mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV -/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l -26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ -+ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z -20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl -lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR -sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 -OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 -OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L -QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X -6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi -HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z -/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e -7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR -d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 -KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ -x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD -Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ -jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL -6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O -gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO -MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB -q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY -S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 -UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 -Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd -DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 -W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn -ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 -K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS -mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.conf deleted file mode 100644 index a5df62ef8..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.conf +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility for PHP and TYPO3 Docker Boilerplate -include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-general.conf deleted file mode 100644 index 31c9bf05a..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-general.conf +++ /dev/null @@ -1 +0,0 @@ -client_max_body_size ; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-location-root.conf deleted file mode 100644 index 28fd811bc..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-location-root.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - try_files $uri $uri/ /?$query_string; -} diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-log.conf deleted file mode 100644 index 9646c6826..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-log.conf +++ /dev/null @@ -1,2 +0,0 @@ -access_log /docker.stdout; -error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-php.conf deleted file mode 100644 index 22b08a50d..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.common.d/10-php.conf +++ /dev/null @@ -1,7 +0,0 @@ -location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_read_timeout ; -} diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf deleted file mode 100644 index b4df6d710..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; -} - -############## -# SSL -############## - -server { - listen 443 ssl default_server; - listen [::]:443 ssl default_server; - - server_name _ docker; - - root ""; - index ; - - include /opt/docker/etc/nginx/vhost.common.d/*.conf; - include /opt/docker/etc/nginx/vhost.ssl.conf; -} diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 28e8aab17..000000000 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf +++ /dev/null @@ -1,6 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive -ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; -ssl_prefer_server_ciphers on; - -ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; -ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.0/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.0/conf/etc/supervisor.d/nginx.conf deleted file mode 100644 index 657bf499b..000000000 --- a/docker/php-nginx/8.0/conf/etc/supervisor.d/nginx.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:nginx] -programs=nginxd -priority=20 - -[program:nginxd] -command = /opt/docker/bin/service.d/nginx.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh deleted file mode 100644 index 1ba70f963..000000000 --- a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Remove daemon statement (will be added as command line argument) -go-replace --mode=lineinfile --regex --regex-backrefs \ - -s '^[\s#]*daemon ' -r '' \ - -- /etc/nginx/nginx.conf - -go-replace --mode=line --regex --regex-backrefs \ - -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ - -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ - -- /etc/nginx/nginx.conf - -# Enable nginx main config -mkdir -p /etc/nginx/conf.d/ -ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf - -rm -f \ - /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf - -if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then - ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf -fi - -# Clear log dir -rm -rf /var/lib/nginx/logs -mkdir -p /var/lib/nginx/logs - -# Set log to stdout/stderr -ln -sf /var/lib/nginx/logs/access.log /docker.stdout -ln -sf /var/lib/nginx/logs/error.log /docker.stderr - -# Fix rights of ssl files -chown -R root:root /opt/docker/etc/nginx/ssl -find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; -find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-php.sh deleted file mode 100644 index 4a7d82647..000000000 --- a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-php.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Restrict php-fpm to local connection -go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' diff --git a/docker/php-nginx/8.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-nginx/8.0/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.0/conf/provision/entrypoint.d/20-nginx.sh deleted file mode 100644 index 0264b6c2e..000000000 --- a/docker/php-nginx/8.0/conf/provision/entrypoint.d/20-nginx.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Create tmp dir for nginx -mkdir -p /var/tmp/nginx/ - -# Prevent startup of nginx (ubuntu 16.04 needs it) -ln -f -s /var/lib/nginx/logs /var/log/nginx - -# Replace markers -go-replace \ - -s "" -r "$WEB_DOCUMENT_INDEX" \ - -s "" -r "$WEB_DOCUMENT_ROOT" \ - -s "" -r "$WEB_ALIAS_DOMAIN" \ - -s "" -r "$HOSTNAME" \ - -s "" -r "$WEB_PHP_SOCKET" \ - -s "" -r "$WEB_PHP_TIMEOUT" \ - -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -z "$WEB_PHP_SOCKET" ]]; then - ## WEB_PHP_SOCKET is not set, remove PHP files - rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf - rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf -fi diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile deleted file mode 100644 index 6f67e0490..000000000 --- a/docker/php-official/5.6/Dockerfile +++ /dev/null @@ -1,220 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:5.6-fpm-stretch - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 5.x - && pecl install apcu-4.0.11 \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached-2.2.0 \ - && pecl install redis-4.3.0 \ - && pecl install mongodb \ - && pecl install imagick \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 deleted file mode 100644 index d2c709a84..000000000 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "5.6-fpm-stretch") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('stretch') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='5.6') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/5.6/conf/VERSION b/docker/php-official/5.6/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/5.6/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/5.6/conf/bin/bootstrap.sh b/docker/php-official/5.6/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/5.6/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/5.6/conf/bin/config.sh b/docker/php-official/5.6/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/5.6/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/5.6/conf/bin/control.sh b/docker/php-official/5.6/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/5.6/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/5.6/conf/bin/entrypoint.sh b/docker/php-official/5.6/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/5.6/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/5.6/conf/bin/provision b/docker/php-official/5.6/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/5.6/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/5.6/conf/bin/provision.py b/docker/php-official/5.6/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/5.6/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/5.6/conf/bin/service.d/cron.sh b/docker/php-official/5.6/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/5.6/conf/bin/service.d/ssh.sh b/docker/php-official/5.6/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/5.6/conf/bin/service.d/supervisor.sh b/docker/php-official/5.6/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/5.6/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/5.6/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/5.6/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-cronjob b/docker/php-official/5.6/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting b/docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-provision b/docker/php-official/5.6/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service b/docker/php-official/5.6/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/5.6/conf/bin/usr-bin/service b/docker/php-official/5.6/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/5.6/conf/bin/usr-bin/version-compare b/docker/php-official/5.6/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/5.6/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/5.6/conf/etc/cron/.gitkeep b/docker/php-official/5.6/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm b/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng b/docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep b/docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/etc/php/fpm/.gitkeep b/docker/php-official/5.6/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/etc/php/php.ini b/docker/php-official/5.6/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/5.6/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini b/docker/php-official/5.6/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/5.6/conf/etc/supervisor.conf b/docker/php-official/5.6/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep b/docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf b/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf b/docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf b/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf b/docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/5.6/conf/provision/ansible.cfg b/docker/php-official/5.6/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/5.6/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/5.6/conf/provision/build.d/.gitkeep b/docker/php-official/5.6/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh b/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep b/docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/roles/.gitkeep b/docker/php-official/5.6/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/service.d/.gitkeep b/docker/php-official/5.6/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/5.6/conf/provision/service.d/cron.sh b/docker/php-official/5.6/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/5.6/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/5.6/conf/provision/service.d/postfix.sh b/docker/php-official/5.6/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/5.6/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/5.6/conf/provision/service.d/ssh.sh b/docker/php-official/5.6/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/5.6/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/5.6/conf/provision/service.d/syslog.sh b/docker/php-official/5.6/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/5.6/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/5.6/conf/provision/variables-webdevops.yml b/docker/php-official/5.6/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/5.6/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/5.6/conf/provision/variables.yml b/docker/php-official/5.6/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/5.6/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile deleted file mode 100644 index 625accc8b..000000000 --- a/docker/php-official/7.0/Dockerfile +++ /dev/null @@ -1,225 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.0-fpm-stretch - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 deleted file mode 100644 index bdaeba431..000000000 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "7.0-fpm-stretch") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('stretch') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='7.0') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.0/conf/VERSION b/docker/php-official/7.0/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.0/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.0/conf/bin/bootstrap.sh b/docker/php-official/7.0/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.0/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.0/conf/bin/config.sh b/docker/php-official/7.0/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.0/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.0/conf/bin/control.sh b/docker/php-official/7.0/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.0/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.0/conf/bin/entrypoint.sh b/docker/php-official/7.0/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.0/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.0/conf/bin/provision b/docker/php-official/7.0/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.0/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.0/conf/bin/provision.py b/docker/php-official/7.0/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.0/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.0/conf/bin/service.d/cron.sh b/docker/php-official/7.0/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.0/conf/bin/service.d/ssh.sh b/docker/php-official/7.0/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.0/conf/bin/service.d/supervisor.sh b/docker/php-official/7.0/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.0/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.0/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.0/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.0/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-provision b/docker/php-official/7.0/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service b/docker/php-official/7.0/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.0/conf/bin/usr-bin/service b/docker/php-official/7.0/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.0/conf/bin/usr-bin/version-compare b/docker/php-official/7.0/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.0/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.0/conf/etc/cron/.gitkeep b/docker/php-official/7.0/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.0/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/etc/php/php.ini b/docker/php-official/7.0/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.0/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini b/docker/php-official/7.0/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.0/conf/etc/supervisor.conf b/docker/php-official/7.0/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.0/conf/provision/ansible.cfg b/docker/php-official/7.0/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.0/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.0/conf/provision/build.d/.gitkeep b/docker/php-official/7.0/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/roles/.gitkeep b/docker/php-official/7.0/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/service.d/.gitkeep b/docker/php-official/7.0/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.0/conf/provision/service.d/cron.sh b/docker/php-official/7.0/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.0/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.0/conf/provision/service.d/postfix.sh b/docker/php-official/7.0/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.0/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.0/conf/provision/service.d/ssh.sh b/docker/php-official/7.0/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.0/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.0/conf/provision/service.d/syslog.sh b/docker/php-official/7.0/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.0/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.0/conf/provision/variables-webdevops.yml b/docker/php-official/7.0/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.0/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.0/conf/provision/variables.yml b/docker/php-official/7.0/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.0/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile deleted file mode 100644 index b048bdd55..000000000 --- a/docker/php-official/7.1-alpine/Dockerfile +++ /dev/null @@ -1,241 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.1-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.1-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.10/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ - && docker-php-ext-enable memcached \ - # Install vips (only works with PHP >= 7.0) - && pecl install apcu \ - && printf "\n" | pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && pecl install yaml \ - && docker-php-ext-enable \ - apcu \ - redis \ - mongodb \ - amqp \ - vips \ - yaml \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.1-alpine/Dockerfile.jinja2 b/docker/php-official/7.1-alpine/Dockerfile.jinja2 deleted file mode 100644 index bab695a85..000000000 --- a/docker/php-official/7.1-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,38 +0,0 @@ - -{{ docker.fromOfficial("php", "7.1-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.10') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.officialAlpine(version='7.1') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.1-alpine/conf/VERSION b/docker/php-official/7.1-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.1-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.1-alpine/conf/bin/bootstrap.sh b/docker/php-official/7.1-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.1-alpine/conf/bin/config.sh b/docker/php-official/7.1-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.1-alpine/conf/bin/control.sh b/docker/php-official/7.1-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.1-alpine/conf/bin/entrypoint.sh b/docker/php-official/7.1-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.1-alpine/conf/bin/provision b/docker/php-official/7.1-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.1-alpine/conf/bin/provision.py b/docker/php-official/7.1-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.1-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/service b/docker/php-official/7.1-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/7.1-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.1-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.1-alpine/conf/etc/cron/.gitkeep b/docker/php-official/7.1-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.1-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.1-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.1-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.1-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.1-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/etc/php/php.ini b/docker/php-official/7.1-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.1-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.1-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.1-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.1-alpine/conf/provision/ansible.cfg b/docker/php-official/7.1-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.1-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.1-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.1-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/roles/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/7.1-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/cron.sh b/docker/php-official/7.1-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.1-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/7.1-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/7.1-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.1-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/7.1-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.1-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/7.1-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1-alpine/conf/provision/variables.yml b/docker/php-official/7.1-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.1-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile deleted file mode 100644 index 645dabd93..000000000 --- a/docker/php-official/7.1/Dockerfile +++ /dev/null @@ -1,225 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.1-fpm-buster - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 deleted file mode 100644 index e89ef35ca..000000000 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "7.1-fpm-buster") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('buster') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='7.1') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.1/conf/VERSION b/docker/php-official/7.1/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.1/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.1/conf/bin/bootstrap.sh b/docker/php-official/7.1/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.1/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.1/conf/bin/config.sh b/docker/php-official/7.1/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.1/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.1/conf/bin/control.sh b/docker/php-official/7.1/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.1/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.1/conf/bin/entrypoint.sh b/docker/php-official/7.1/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.1/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.1/conf/bin/provision b/docker/php-official/7.1/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.1/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.1/conf/bin/provision.py b/docker/php-official/7.1/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.1/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.1/conf/bin/service.d/cron.sh b/docker/php-official/7.1/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.1/conf/bin/service.d/ssh.sh b/docker/php-official/7.1/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.1/conf/bin/service.d/supervisor.sh b/docker/php-official/7.1/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.1/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.1/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.1/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.1/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-provision b/docker/php-official/7.1/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service b/docker/php-official/7.1/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.1/conf/bin/usr-bin/service b/docker/php-official/7.1/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.1/conf/bin/usr-bin/version-compare b/docker/php-official/7.1/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.1/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.1/conf/etc/cron/.gitkeep b/docker/php-official/7.1/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.1/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/etc/php/php.ini b/docker/php-official/7.1/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.1/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini b/docker/php-official/7.1/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.1/conf/etc/supervisor.conf b/docker/php-official/7.1/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.1/conf/provision/ansible.cfg b/docker/php-official/7.1/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.1/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.1/conf/provision/build.d/.gitkeep b/docker/php-official/7.1/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/roles/.gitkeep b/docker/php-official/7.1/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/service.d/.gitkeep b/docker/php-official/7.1/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.1/conf/provision/service.d/cron.sh b/docker/php-official/7.1/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.1/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.1/conf/provision/service.d/postfix.sh b/docker/php-official/7.1/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.1/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.1/conf/provision/service.d/ssh.sh b/docker/php-official/7.1/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.1/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.1/conf/provision/service.d/syslog.sh b/docker/php-official/7.1/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.1/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.1/conf/provision/variables-webdevops.yml b/docker/php-official/7.1/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.1/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1/conf/provision/variables.yml b/docker/php-official/7.1/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.1/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile deleted file mode 100644 index 9c576f6f8..000000000 --- a/docker/php-official/7.2-alpine/Dockerfile +++ /dev/null @@ -1,245 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.2-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.2-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.11/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - # Memcached for 7.3 can currently only be built from master - && MEMCACHED="`mktemp -d`" \ - && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ - && docker-php-ext-configure $MEMCACHED \ - && docker-php-ext-install $MEMCACHED \ - && rm -rf $MEMCACHED \ - # Install vips (only works with PHP >= 7.0) - && pecl install apcu \ - && printf "\n" | pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && pecl install yaml \ - && docker-php-ext-enable \ - apcu \ - redis \ - mongodb \ - amqp \ - vips \ - yaml \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.2-alpine/Dockerfile.jinja2 b/docker/php-official/7.2-alpine/Dockerfile.jinja2 deleted file mode 100644 index f79e75ed4..000000000 --- a/docker/php-official/7.2-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,38 +0,0 @@ - -{{ docker.fromOfficial("php", "7.2-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.11') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.officialAlpine(version='7.3') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.2-alpine/conf/VERSION b/docker/php-official/7.2-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.2-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.2-alpine/conf/bin/bootstrap.sh b/docker/php-official/7.2-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.2-alpine/conf/bin/config.sh b/docker/php-official/7.2-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.2-alpine/conf/bin/control.sh b/docker/php-official/7.2-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.2-alpine/conf/bin/entrypoint.sh b/docker/php-official/7.2-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.2-alpine/conf/bin/provision b/docker/php-official/7.2-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.2-alpine/conf/bin/provision.py b/docker/php-official/7.2-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.2-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/service b/docker/php-official/7.2-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/7.2-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.2-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.2-alpine/conf/etc/cron/.gitkeep b/docker/php-official/7.2-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.2-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.2-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.2-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.2-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.2-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/etc/php/php.ini b/docker/php-official/7.2-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.2-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.2-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.2-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.2-alpine/conf/provision/ansible.cfg b/docker/php-official/7.2-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.2-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.2-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.2-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/roles/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/7.2-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/cron.sh b/docker/php-official/7.2-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.2-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/7.2-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/7.2-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.2-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/7.2-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.2-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/7.2-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.2-alpine/conf/provision/variables.yml b/docker/php-official/7.2-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.2-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile deleted file mode 100644 index 1aff39596..000000000 --- a/docker/php-official/7.2/Dockerfile +++ /dev/null @@ -1,224 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.2 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.2-fpm-buster - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.2/Dockerfile.jinja2 b/docker/php-official/7.2/Dockerfile.jinja2 deleted file mode 100644 index 9f8fc29f9..000000000 --- a/docker/php-official/7.2/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "7.2-fpm-buster") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('buster') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='7.2') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.2/conf/VERSION b/docker/php-official/7.2/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.2/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.2/conf/bin/bootstrap.sh b/docker/php-official/7.2/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.2/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.2/conf/bin/config.sh b/docker/php-official/7.2/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.2/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.2/conf/bin/control.sh b/docker/php-official/7.2/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.2/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.2/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.2/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.2/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.2/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.2/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.2/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.2/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.2/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.2/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.2/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.2/conf/bin/entrypoint.sh b/docker/php-official/7.2/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.2/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.2/conf/bin/provision b/docker/php-official/7.2/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.2/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.2/conf/bin/provision.py b/docker/php-official/7.2/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.2/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.2/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.2/conf/bin/service.d/cron.sh b/docker/php-official/7.2/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.2/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.2/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.2/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.2/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.2/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.2/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.2/conf/bin/service.d/postfix.sh b/docker/php-official/7.2/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.2/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.2/conf/bin/service.d/ssh.sh b/docker/php-official/7.2/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.2/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.2/conf/bin/service.d/supervisor.sh b/docker/php-official/7.2/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.2/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.2/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.2/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.2/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.2/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.2/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.2/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.2/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.2/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-provision b/docker/php-official/7.2/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-service b/docker/php-official/7.2/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.2/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.2/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.2/conf/bin/usr-bin/service b/docker/php-official/7.2/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.2/conf/bin/usr-bin/version-compare b/docker/php-official/7.2/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.2/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.2/conf/etc/cron/.gitkeep b/docker/php-official/7.2/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.2/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.2/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.2/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.2/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.2/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.2/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/etc/php/php.ini b/docker/php-official/7.2/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.2/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.2/conf/etc/php/php.webdevops.ini b/docker/php-official/7.2/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.2/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.2/conf/etc/supervisor.conf b/docker/php-official/7.2/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.2/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.2/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.2/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.2/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.2/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.2/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.2/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.2/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.2/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.2/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.2/conf/provision/ansible.cfg b/docker/php-official/7.2/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.2/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.2/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.2/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.2/conf/provision/build.d/.gitkeep b/docker/php-official/7.2/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.2/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.2/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.2/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.2/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.2/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.2/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.2/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/roles/.gitkeep b/docker/php-official/7.2/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/service.d/.gitkeep b/docker/php-official/7.2/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.2/conf/provision/service.d/cron.sh b/docker/php-official/7.2/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.2/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.2/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.2/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.2/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.2/conf/provision/service.d/postfix.sh b/docker/php-official/7.2/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.2/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.2/conf/provision/service.d/ssh.sh b/docker/php-official/7.2/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.2/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.2/conf/provision/service.d/syslog.sh b/docker/php-official/7.2/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.2/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.2/conf/provision/variables-webdevops.yml b/docker/php-official/7.2/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.2/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.2/conf/provision/variables.yml b/docker/php-official/7.2/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.2/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile deleted file mode 100644 index 8204398a6..000000000 --- a/docker/php-official/7.3-alpine/Dockerfile +++ /dev/null @@ -1,245 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.3-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.3-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.11/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - # Memcached for 7.3 can currently only be built from master - && MEMCACHED="`mktemp -d`" \ - && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ - && docker-php-ext-configure $MEMCACHED \ - && docker-php-ext-install $MEMCACHED \ - && rm -rf $MEMCACHED \ - # Install vips (only works with PHP >= 7.0) - && pecl install apcu \ - && printf "\n" | pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && pecl install yaml \ - && docker-php-ext-enable \ - apcu \ - redis \ - mongodb \ - amqp \ - vips \ - yaml \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.3-alpine/Dockerfile.jinja2 b/docker/php-official/7.3-alpine/Dockerfile.jinja2 deleted file mode 100644 index bbbfc0e00..000000000 --- a/docker/php-official/7.3-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,38 +0,0 @@ - -{{ docker.fromOfficial("php", "7.3-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.11') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.officialAlpine(version='7.3') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.3-alpine/conf/VERSION b/docker/php-official/7.3-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.3-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.3-alpine/conf/bin/bootstrap.sh b/docker/php-official/7.3-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.3-alpine/conf/bin/config.sh b/docker/php-official/7.3-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.3-alpine/conf/bin/control.sh b/docker/php-official/7.3-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.3-alpine/conf/bin/entrypoint.sh b/docker/php-official/7.3-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.3-alpine/conf/bin/provision b/docker/php-official/7.3-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.3-alpine/conf/bin/provision.py b/docker/php-official/7.3-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.3-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/service b/docker/php-official/7.3-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.3-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/7.3-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.3-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.3-alpine/conf/etc/cron/.gitkeep b/docker/php-official/7.3-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.3-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.3-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.3-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.3-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.3-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.3-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/etc/php/php.ini b/docker/php-official/7.3-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.3-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/7.3-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.3-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.3-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.3-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.3-alpine/conf/provision/ansible.cfg b/docker/php-official/7.3-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.3-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.3-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.3-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/roles/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/7.3-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/cron.sh b/docker/php-official/7.3-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.3-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/7.3-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/7.3-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.3-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/7.3-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.3-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/7.3-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.3-alpine/conf/provision/variables.yml b/docker/php-official/7.3-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.3-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile deleted file mode 100644 index d3ba03564..000000000 --- a/docker/php-official/7.3/Dockerfile +++ /dev/null @@ -1,224 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.3 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.3-fpm-buster - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.3/Dockerfile.jinja2 b/docker/php-official/7.3/Dockerfile.jinja2 deleted file mode 100644 index b0c9245e2..000000000 --- a/docker/php-official/7.3/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "7.3-fpm-buster") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('buster') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='7.3') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.3/conf/VERSION b/docker/php-official/7.3/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.3/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.3/conf/bin/bootstrap.sh b/docker/php-official/7.3/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.3/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.3/conf/bin/config.sh b/docker/php-official/7.3/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.3/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.3/conf/bin/control.sh b/docker/php-official/7.3/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.3/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.3/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.3/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.3/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.3/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.3/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.3/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.3/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.3/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.3/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.3/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.3/conf/bin/entrypoint.sh b/docker/php-official/7.3/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.3/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.3/conf/bin/provision b/docker/php-official/7.3/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.3/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.3/conf/bin/provision.py b/docker/php-official/7.3/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.3/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.3/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.3/conf/bin/service.d/cron.sh b/docker/php-official/7.3/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.3/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.3/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.3/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.3/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.3/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.3/conf/bin/service.d/postfix.sh b/docker/php-official/7.3/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.3/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.3/conf/bin/service.d/ssh.sh b/docker/php-official/7.3/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.3/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.3/conf/bin/service.d/supervisor.sh b/docker/php-official/7.3/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.3/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.3/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.3/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.3/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.3/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.3/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.3/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.3/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.3/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-provision b/docker/php-official/7.3/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-service b/docker/php-official/7.3/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.3/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.3/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.3/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.3/conf/bin/usr-bin/service b/docker/php-official/7.3/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.3/conf/bin/usr-bin/version-compare b/docker/php-official/7.3/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.3/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.3/conf/etc/cron/.gitkeep b/docker/php-official/7.3/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.3/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.3/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.3/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.3/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.3/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.3/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.3/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.3/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/etc/php/php.ini b/docker/php-official/7.3/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.3/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.3/conf/etc/php/php.webdevops.ini b/docker/php-official/7.3/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.3/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.3/conf/etc/supervisor.conf b/docker/php-official/7.3/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.3/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.3/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.3/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.3/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.3/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.3/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.3/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.3/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.3/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.3/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.3/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.3/conf/provision/ansible.cfg b/docker/php-official/7.3/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.3/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.3/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.3/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.3/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.3/conf/provision/build.d/.gitkeep b/docker/php-official/7.3/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.3/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.3/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.3/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.3/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.3/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.3/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.3/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.3/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.3/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.3/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.3/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/roles/.gitkeep b/docker/php-official/7.3/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/service.d/.gitkeep b/docker/php-official/7.3/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.3/conf/provision/service.d/cron.sh b/docker/php-official/7.3/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.3/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.3/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.3/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.3/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.3/conf/provision/service.d/postfix.sh b/docker/php-official/7.3/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.3/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.3/conf/provision/service.d/ssh.sh b/docker/php-official/7.3/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.3/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.3/conf/provision/service.d/syslog.sh b/docker/php-official/7.3/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.3/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.3/conf/provision/variables-webdevops.yml b/docker/php-official/7.3/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.3/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.3/conf/provision/variables.yml b/docker/php-official/7.3/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.3/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile deleted file mode 100644 index bc0458a51..000000000 --- a/docker/php-official/7.4-alpine/Dockerfile +++ /dev/null @@ -1,248 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.4-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.4-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.11/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - ffi \ - imagick \ - amqp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - # Memcached for 7.3 can currently only be built from master - && MEMCACHED="`mktemp -d`" \ - && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ - && docker-php-ext-configure $MEMCACHED \ - && docker-php-ext-install $MEMCACHED \ - && rm -rf $MEMCACHED \ - # Install vips (only works with PHP >= 7.0) - && pecl install apcu \ - && printf "\n" | pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install yaml \ - && docker-php-ext-enable \ - apcu \ - redis \ - mongodb \ - amqp \ - vips \ - yaml \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.4-alpine/Dockerfile.jinja2 b/docker/php-official/7.4-alpine/Dockerfile.jinja2 deleted file mode 100644 index 18b89a079..000000000 --- a/docker/php-official/7.4-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,38 +0,0 @@ - -{{ docker.fromOfficial("php", "7.4-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.11') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.officialAlpine(version='7.4') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.4-alpine/conf/VERSION b/docker/php-official/7.4-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.4-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.4-alpine/conf/bin/bootstrap.sh b/docker/php-official/7.4-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.4-alpine/conf/bin/config.sh b/docker/php-official/7.4-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.4-alpine/conf/bin/control.sh b/docker/php-official/7.4-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.4-alpine/conf/bin/entrypoint.sh b/docker/php-official/7.4-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.4-alpine/conf/bin/provision b/docker/php-official/7.4-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.4-alpine/conf/bin/provision.py b/docker/php-official/7.4-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/cron.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.4-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/service b/docker/php-official/7.4-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.4-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/7.4-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.4-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.4-alpine/conf/etc/cron/.gitkeep b/docker/php-official/7.4-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.4-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.4-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.4-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.4-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.4-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.4-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/etc/php/php.ini b/docker/php-official/7.4-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.4-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/7.4-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.4-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.4-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.4-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.4-alpine/conf/provision/ansible.cfg b/docker/php-official/7.4-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.4-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.4-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.4-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/roles/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/7.4-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/cron.sh b/docker/php-official/7.4-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.4-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/7.4-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/7.4-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.4-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/7.4-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.4-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/7.4-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.4-alpine/conf/provision/variables.yml b/docker/php-official/7.4-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.4-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile deleted file mode 100644 index 17a6da264..000000000 --- a/docker/php-official/7.4/Dockerfile +++ /dev/null @@ -1,224 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:7.4 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:7.4-fpm-buster - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - amqp \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/7.4/Dockerfile.jinja2 b/docker/php-official/7.4/Dockerfile.jinja2 deleted file mode 100644 index 4c7aa284b..000000000 --- a/docker/php-official/7.4/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "7.4-fpm-buster") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('buster') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='7.4') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.4/conf/VERSION b/docker/php-official/7.4/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/7.4/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/7.4/conf/bin/bootstrap.sh b/docker/php-official/7.4/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/7.4/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/7.4/conf/bin/config.sh b/docker/php-official/7.4/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/7.4/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/7.4/conf/bin/control.sh b/docker/php-official/7.4/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/7.4/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/7.4/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.4/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/7.4/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.4/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/7.4/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.4/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/7.4/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.4/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/7.4/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.4/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/7.4/conf/bin/entrypoint.sh b/docker/php-official/7.4/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/7.4/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/7.4/conf/bin/provision b/docker/php-official/7.4/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/7.4/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/7.4/conf/bin/provision.py b/docker/php-official/7.4/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/7.4/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/7.4/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/7.4/conf/bin/service.d/cron.sh b/docker/php-official/7.4/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/7.4/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/7.4/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.4/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/7.4/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.4/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/7.4/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/7.4/conf/bin/service.d/postfix.sh b/docker/php-official/7.4/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/7.4/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/7.4/conf/bin/service.d/ssh.sh b/docker/php-official/7.4/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/7.4/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/7.4/conf/bin/service.d/supervisor.sh b/docker/php-official/7.4/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/7.4/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.4/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/7.4/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.4/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/7.4/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/7.4/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/7.4/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/7.4/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-cronjob b/docker/php-official/7.4/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-php-setting b/docker/php-official/7.4/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-provision b/docker/php-official/7.4/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-service b/docker/php-official/7.4/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.4/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/7.4/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.4/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/7.4/conf/bin/usr-bin/service b/docker/php-official/7.4/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/7.4/conf/bin/usr-bin/version-compare b/docker/php-official/7.4/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/7.4/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/7.4/conf/etc/cron/.gitkeep b/docker/php-official/7.4/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.4/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/7.4/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/7.4/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.4/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/7.4/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/7.4/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.4/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/etc/php/fpm/.gitkeep b/docker/php-official/7.4/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/etc/php/php.ini b/docker/php-official/7.4/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/7.4/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/7.4/conf/etc/php/php.webdevops.ini b/docker/php-official/7.4/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/7.4/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.4/conf/etc/supervisor.conf b/docker/php-official/7.4/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.4/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.4/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.4/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.4/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.4/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.4/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.4/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/7.4/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.4/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.4/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/7.4/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/7.4/conf/provision/ansible.cfg b/docker/php-official/7.4/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.4/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/7.4/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/7.4/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/7.4/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.4/conf/provision/build.d/.gitkeep b/docker/php-official/7.4/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.4/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/7.4/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/7.4/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.4/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.4/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/7.4/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/7.4/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/7.4/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/7.4/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/7.4/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.4/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/roles/.gitkeep b/docker/php-official/7.4/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/service.d/.gitkeep b/docker/php-official/7.4/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/7.4/conf/provision/service.d/cron.sh b/docker/php-official/7.4/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/7.4/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/7.4/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.4/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/7.4/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.4/conf/provision/service.d/postfix.sh b/docker/php-official/7.4/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/7.4/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/7.4/conf/provision/service.d/ssh.sh b/docker/php-official/7.4/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/7.4/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/7.4/conf/provision/service.d/syslog.sh b/docker/php-official/7.4/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/7.4/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.4/conf/provision/variables-webdevops.yml b/docker/php-official/7.4/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.4/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.4/conf/provision/variables.yml b/docker/php-official/7.4/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/7.4/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile deleted file mode 100644 index 5667a398e..000000000 --- a/docker/php-official/8.0-alpine/Dockerfile +++ /dev/null @@ -1,254 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.0-alpine -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:8.0-fpm-alpine - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.16/community/ >> /etc/apk/repositories \ - # System update - && /usr/local/bin/apk-upgrade \ - # Install base stuff - && apk-install \ - bash \ - ca-certificates \ - openssl \ - && update-ca-certificates \ - && /usr/local/bin/generate-dockerimage-info \ - ## Fix su execution (eg for tests) - && mkdir -p /etc/pam.d/ \ - && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su - -RUN set -x \ - # Install services - && chmod +x /opt/docker/bin/* \ - && apk-install \ - supervisor \ - wget \ - curl \ - vim \ - sed \ - tzdata \ - busybox-suid \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - && apk-install shadow \ - && apk-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - drill \ - ldns \ - openssh-client \ - rsync \ - patch \ - git \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apk-install \ - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - pngcrush \ - optipng \ - pngquant \ - vips \ - rabbitmq-c \ - c-client \ - # Libraries - libldap \ - icu-libs \ - libintl \ - libpq \ - libxslt \ - libgomp \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - linux-headers \ - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - imagemagick-dev \ - rabbitmq-c-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # https://github.com/docker-library/php/issues/240 - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - ffi \ - imagick \ - amqp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xsl \ - zip \ - gd \ - opcache \ - # Install extensions for PHP 7.x - # Memcached for 7.3 can currently only be built from master - && MEMCACHED="`mktemp -d`" \ - && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ - && docker-php-ext-configure $MEMCACHED \ - && docker-php-ext-install $MEMCACHED \ - && rm -rf $MEMCACHED \ - && pecl install apcu \ - && pecl install excimer \ - && pecl install opentelemetry \ - && pecl install protobuf \ - && pecl install vips \ - && pecl install yaml \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install xmlrpc-1.0.0RC3 \ - && docker-php-ext-enable \ - apcu \ - excimer \ - opentelemetry \ - protobuf \ - vips \ - yaml \ - redis \ - xmlrpc \ - imagick \ - mongodb \ - # Uninstall dev and header packages - && apk del -f --purge \ - autoconf \ - linux-headers \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-dev \ - gmp-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - vips-dev \ - krb5-dev \ - openssl-dev \ - imap-dev \ - rabbitmq-c-dev \ - imagemagick-dev \ - openldap-dev \ - icu-dev \ - postgresql-dev \ - libxml2-dev \ - ldb-dev \ - pcre-dev \ - libxslt-dev \ - libzip-dev \ - libmemcached-dev \ - yaml-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 2d77b6d42..000000000 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,38 +0,0 @@ - -{{ docker.fromOfficial("php", "8.0-fpm-alpine") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} -{{ environment.phpAlpineIconvWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.alpine('3.16') }} - -RUN set -x \ - {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.officialAlpine(version='8.0') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.0-alpine/conf/VERSION b/docker/php-official/8.0-alpine/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/8.0-alpine/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/8.0-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.0-alpine/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/8.0-alpine/conf/bin/config.sh b/docker/php-official/8.0-alpine/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/8.0-alpine/conf/bin/control.sh b/docker/php-official/8.0-alpine/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/8.0-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.0-alpine/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/8.0-alpine/conf/bin/provision b/docker/php-official/8.0-alpine/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.0-alpine/conf/bin/provision.py b/docker/php-official/8.0-alpine/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/cron.sh deleted file mode 100644 index 5af135768..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.0-alpine/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/service b/docker/php-official/8.0-alpine/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/8.0-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.0-alpine/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/8.0-alpine/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/8.0-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.0-alpine/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.0-alpine/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/8.0-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.0-alpine/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/8.0-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.0-alpine/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.0-alpine/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/etc/php/php.ini b/docker/php-official/8.0-alpine/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/8.0-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.0-alpine/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.0-alpine/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.0-alpine/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/8.0-alpine/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/8.0-alpine/conf/provision/ansible.cfg b/docker/php-official/8.0-alpine/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 7a7b42f6b..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Add group -addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" - diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index 71caa48d3..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu|Alpine) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.0-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.0-alpine/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.0-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.0-alpine/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.0-alpine/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.0-alpine/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.0-alpine/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.0-alpine/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/8.0-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.0-alpine/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.0-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.0-alpine/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.0-alpine/conf/provision/variables.yml b/docker/php-official/8.0-alpine/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.0-alpine/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile deleted file mode 100644 index 1f98e1b35..000000000 --- a/docker/php-official/8.0/Dockerfile +++ /dev/null @@ -1,229 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:8.0-fpm-bookworm - -LABEL maintainer=info@webdevops.io \ - vendor=WebDevOps.io \ - io.webdevops.layout=8 \ - io.webdevops.version=1.5.0 - -ENV TERM="xterm" \ - LANG="C.UTF-8" \ - LC_ALL="C.UTF-8" -ENV DOCKER_CONF_HOME=/opt/docker/ \ - LOG_STDOUT="" \ - LOG_STDERR="" -ENV APPLICATION_USER=application \ - APPLICATION_GROUP=application \ - APPLICATION_PATH=/app \ - APPLICATION_UID=1000 \ - APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" -ENV COMPOSER_VERSION="2" - - -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Init bootstrap - && apt-update \ - && /usr/local/bin/generate-dockerimage-info \ - # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ - && apt-update \ - # System update - && /usr/local/bin/apt-upgrade \ - # Base stuff - && apt-install \ - apt-transport-https \ - ca-certificates \ - locales \ - gnupg - -RUN set -x \ - # Install packages - && chmod +x /opt/docker/bin/* \ - && apt-install \ - supervisor \ - wget \ - curl \ - vim \ - net-tools \ - tzdata \ - && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install services - && apt-install \ - # Install common tools - zip \ - unzip \ - bzip2 \ - moreutils \ - dnsutils \ - openssh-client \ - rsync \ - git \ - patch \ - && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # Install php environment - && apt-install \ - # Install tools - imagemagick \ - graphicsmagick \ - ghostscript \ - jpegoptim \ - libjpeg-turbo-progs \ - pngcrush \ - optipng \ - apngopt \ - pngnq \ - pngquant \ - # Libraries - libvips42 \ - librabbitmq4 \ - libldap-2.5-0 \ - libxslt1.1 \ - libldap-common \ - zlib1g \ - libpq5 \ - libpng16-16 \ - libmcrypt4 \ - libzip4 \ - # Dev and headers - libjpeg62-turbo-dev \ - libwebp-dev \ - libfreetype6-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libmemcached-dev \ - libpng-dev \ - libpq-dev \ - libzip-dev \ - libc-client-dev \ - libc-client2007e-dev \ - libkrb5-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - # Install guetzli - && wget https://github.com/google/guetzli/archive/master.zip \ - && unzip master.zip \ - && make -C guetzli-master \ - && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ - && rm -rf master.zip guetzli-master \ - # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ - && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ - # Install extensions - && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ - && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap \ - && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ - && docker-php-ext-install \ - bcmath \ - amqp \ - imagick \ - ffi \ - bz2 \ - calendar \ - exif \ - ftp \ - gmp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xsl \ - zip \ - gd \ - opcache \ - && pecl install memcached \ - && pecl install apcu \ - && pecl install excimer \ - && pecl install opentelemetry \ - && pecl install protobuf \ - && pecl install xmlrpc-1.0.0RC3 \ - && pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \ - && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \ - && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ - # Uninstall dev and header packages - && apt-get purge -y -f --force-yes \ - libc-client-dev \ - libkrb5-dev \ - libbz2-dev \ - libicu-dev \ - libldap2-dev \ - libldb-dev \ - libmcrypt-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - libpng-dev \ - libwebp-dev \ - libpq-dev \ - libzip-dev \ - libvips-dev \ - librabbitmq-dev \ - libmagick++-dev \ - libgmp-dev \ - && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ - && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ - # Enable php services - && docker-service enable syslog \ - && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup - -WORKDIR / -EXPOSE 9000 -ENTRYPOINT ["/entrypoint"] -CMD ["supervisord"] diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 deleted file mode 100644 index f4803b855..000000000 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "8.0-fpm-bookworm") }} - -{{ docker.version() }} - -{{ environment.general() }} -{{ environment.base() }} -{{ environment.baseApp() }} -{{ environment.phpOfficialSendmailWorkaround() }} -{{ environment.phpComposerVersion() }} - -{{ baselayout.copy() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ bootstrap.debian('bookworm') }} - -RUN set -x \ - {{ base.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ baseapp.debian() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ php.official(version='8.0',distribution='bookworm') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -{{ docker.workdir('/') }} -{{ docker.expose('9000') }} -{{ docker.entrypoint("/entrypoint") }} -{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.0/conf/VERSION b/docker/php-official/8.0/conf/VERSION deleted file mode 100644 index 301160a93..000000000 --- a/docker/php-official/8.0/conf/VERSION +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/docker/php-official/8.0/conf/bin/bootstrap.sh b/docker/php-official/8.0/conf/bin/bootstrap.sh deleted file mode 100644 index b1b3acdbc..000000000 --- a/docker/php-official/8.0/conf/bin/bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-run-bootstrap diff --git a/docker/php-official/8.0/conf/bin/config.sh b/docker/php-official/8.0/conf/bin/config.sh deleted file mode 100644 index 46265a3c0..000000000 --- a/docker/php-official/8.0/conf/bin/config.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob - -### - # Check if current user is root - # - ## -function rootCheck() { - # Root check - if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] $* must be run as root" - exit 1 - fi -} - -### - # Create /docker.stdout and /docker.stderr - # - ## -function createDockerStdoutStderr() { - # link stdout from docker - if [[ -n "$LOG_STDOUT" ]]; then - echo "Log stdout redirected to $LOG_STDOUT" - else - LOG_STDOUT="/proc/$$/fd/1" - fi - - if [[ -n "$LOG_STDERR" ]]; then - echo "Log stderr redirected to $LOG_STDERR" - else - LOG_STDERR="/proc/$$/fd/2" - fi - - ln -f -s "$LOG_STDOUT" /docker.stdout - ln -f -s "$LOG_STDERR" /docker.stderr -} -### - # Include script directory text inside a file - # - # $1 -> path - # - ## -function includeScriptDir() { - if [[ -d "$1" ]]; then - for FILE in "$1"/*.sh; do - echo "-> Executing ${FILE}" - # run custom scripts, only once - . "$FILE" - done - fi -} - -### - # Show deprecation notice - # - ## -function deprecationNotice() { - echo "" - echo "###############################################################################" - echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" - echo "###" - echo "### $*" - echo "###" - echo "###############################################################################" - echo "" -} - -### - # Run "entrypoint" scripts - ## -function runEntrypoints() { - ############### - # Try to find entrypoint - ############### - - ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" - - if [ -f "$ENTRYPOINT_SCRIPT" ]; then - . "$ENTRYPOINT_SCRIPT" - fi - - ############### - # Run default - ############### - if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then - . /opt/docker/bin/entrypoint.d/default.sh - fi - - exit 1 -} - - # Run "entrypoint" provisioning - ## -function runProvisionEntrypoint() { - includeScriptDir "/opt/docker/provision/entrypoint.d" - includeScriptDir "/entrypoint.d" -} - -### - # List environment variables (based on prefix) - ## -function envListVars() { - if [[ $# -eq 1 ]]; then - env | grep "^${1}" | cut -d= -f1 - else - env | cut -d= -f1 - fi -} - -### - # Get environment variable (even with dots in name) - # - ## -function envGetValue() { - awk "BEGIN {print ENVIRON[\"$1\"]}" -} diff --git a/docker/php-official/8.0/conf/bin/control.sh b/docker/php-official/8.0/conf/bin/control.sh deleted file mode 100644 index 22d189745..000000000 --- a/docker/php-official/8.0/conf/bin/control.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -CONTROL_COMMAND="$1" -shift - -case "$CONTROL_COMMAND" in - - ## ------------------------------------------ - ## PROVISION - ## ------------------------------------------ - - ## main roles - "provision.role") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" - ;; - - "provision.role.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap "$1" - ;; - - "provision.role.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build "$1" - ;; - - "provision.role.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild "$1" - ;; - - "provision.role.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint "$1" - ;; - - ## startup roles - "provision.role.startup") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" - ;; - - "provision.role.startup.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" - ;; - - "provision.role.startup.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 50 "$1" - ;; - - "provision.role.startup.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" - ;; - - "provision.role.startup.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" - ;; - - ## finish roles - "provision.role.finish") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" - ;; - - "provision.role.finish.bootstrap") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" - ;; - - "provision.role.finish.build") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag build --priority 200 "$1" - ;; - - "provision.role.finish.onbuild") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" - ;; - - "provision.role.finish.entrypoint") - deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" - /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" - ;; - - ## ------------------------------------------ - ## Service - ## ------------------------------------------ - - "service.enable") - deprecationNotice " Please use >>docker-service-enable [service]<<" - docker-service-enable "$1" - ;; - - "service.disable") - deprecationNotice " Please use >>docker-service-disable [service]<<" - docker-service-disable "$1" - ;; - - ## ------------------------------------------ - ## Version - ## ------------------------------------------ - - "version.get") - cat /opt/docker/VERSION - ;; - - "version.require.min") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is not up2date!" - echo "--- " - echo "--- Version expected min: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "--- " - echo "--- Run 'docker pull ' to update image" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - "version.require.max") - EXPECTED_VERSION="$1" - CURRENT_VERSION="$(cat /opt/docker/VERSION)" - if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then - echo "-----------------------------------------------------------" - echo "--- This docker image is too new!" - echo "--- " - echo "--- Version expected max: $EXPECTED_VERSION" - echo "--- Version current: $CURRENT_VERSION" - echo "-----------------------------------------------------------" - exit 1 - fi - ;; - - - "buildtime.get") - cat /opt/docker/BUILDTIME - ;; - - *) - echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" - exit 1 - ;; -esac diff --git a/docker/php-official/8.0/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.0/conf/bin/entrypoint.d/cli.sh deleted file mode 100644 index fe212a8ea..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.d/cli.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Run CLI_SCRIPT from environment variable -############################################# - -if [ -n "${CLI_SCRIPT}" ]; then - if [ -n "$APPLICATION_USER" ]; then - # Run as EFFECTIVE_USER - shift - exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" - else - # Run as root - exec ${CLI_SCRIPT} "$@" - fi -else - echo "[ERROR] No CLI_SCRIPT in in docker environment defined" - exit 1 -fi diff --git a/docker/php-official/8.0/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.0/conf/bin/entrypoint.d/default.sh deleted file mode 100644 index a1be715fe..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.d/default.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec "$@" diff --git a/docker/php-official/8.0/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.0/conf/bin/entrypoint.d/noop.sh deleted file mode 100644 index 092d55d8b..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.d/noop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## NOOP (no operation) -############################################# - -exec tail -f /dev/null diff --git a/docker/php-official/8.0/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.0/conf/bin/entrypoint.d/root.sh deleted file mode 100644 index 6fa0d063e..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.d/root.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Root shell -############################################# - -if [ "$#" -eq 1 ]; then - ## No command, fall back to interactive shell - exec bash -else - ## Exec root command - shift - exec "$@" -fi diff --git a/docker/php-official/8.0/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.0/conf/bin/entrypoint.d/supervisord.sh deleted file mode 100644 index f21489667..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.d/supervisord.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -############################################# -## Supervisord (start daemons) -############################################# - -## Start services -exec /opt/docker/bin/service.d/supervisor.sh - diff --git a/docker/php-official/8.0/conf/bin/entrypoint.sh b/docker/php-official/8.0/conf/bin/entrypoint.sh deleted file mode 100644 index 0489b796c..000000000 --- a/docker/php-official/8.0/conf/bin/entrypoint.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -if [[ -z "$CONTAINER_UID" ]]; then - export CONTAINER_UID="application" -fi - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# auto elevate privileges (if container is not started as root) -if [[ "$UID" -ne 0 ]]; then - export CONTAINER_UID="$UID" - exec gosu root "$0" "$@" -fi -# remove suid bit on gosu -chmod -s /sbin/gosu - -trap 'echo sigterm ; exit' SIGTERM -trap 'echo sigkill ; exit' SIGKILL - -# sanitize input and set task -TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" - -source /opt/docker/bin/config.sh - -createDockerStdoutStderr - -if [[ "$UID" -eq 0 ]]; then - # Only run provision if user is root - - if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then - # Visible provisioning - runProvisionEntrypoint - else - # Hidden provisioning - runProvisionEntrypoint > /dev/null - fi -fi - -############################# -## COMMAND -############################# - -runEntrypoints "$@" diff --git a/docker/php-official/8.0/conf/bin/provision b/docker/php-official/8.0/conf/bin/provision deleted file mode 100755 index 418e81dd8..000000000 --- a/docker/php-official/8.0/conf/bin/provision +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -# Install ansible if not installed -if [ -z "`which ansible-playbook`" ]; then - docker-ansible-install -fi - -exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.0/conf/bin/provision.py b/docker/php-official/8.0/conf/bin/provision.py deleted file mode 100755 index d367c2812..000000000 --- a/docker/php-official/8.0/conf/bin/provision.py +++ /dev/null @@ -1,328 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -import json -import sys -from string import Template -from subprocess import call -import tempfile -import time - -STORAGE = '/opt/docker/etc/.registry/provision.json' -PROVISION_DIR = '/opt/docker/provision/' - -PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] - -PLAYBOOK = Template( -"""--- - -- hosts: all - vars_files: - - ./variables-webdevops.yml - - ./variables.yml - roles: - - $roles -""") - - - -def readJson(): - ret = {} - - # create registry directory if it doesn't exists - if not os.path.exists(os.path.dirname(STORAGE)): - os.mkdir(os.path.dirname(STORAGE)) - - # try to read file - if os.path.isfile(STORAGE): - f=open(STORAGE).read() - ret = json.loads(f) - - return ret - - - -def saveJson(data): - with open(STORAGE, 'w') as f: - json.dump(data, f) - - - -def buildRoleList(tags): - json = readJson() - roleList = {} - - # fetch roles list for each tag - for tag in tags: - if tag in json: - for role in json[tag]: - roleRow = json[tag][role] - if role not in roleList: - roleList[role] = {} - - if 'tags' not in roleList[role]: - roleList[role]['tags'] = {} - - roleList[role]['role'] = role - roleList[role]['added'] = roleRow['added'] - roleList[role]['priority'] = roleRow['priority'] - roleList[role]['tags'][tag] = tag - - return roleList - - -def buildSortedRoleList(tags): - roleList = buildRoleList(tags) - - # sort list - roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) - - return roleList - - - -def buildPlaybook(roleList): - ## build playbook - ret = PLAYBOOK.substitute( - roles = "\n - ".join(roleList) - ) - - return ret - - -def buildPlaybookFromArgs(args): - roleList = [] - - ## add roles from tag (if use registry is active) - if args.useRegistry and args.tags: - roleList.extend(buildSortedRoleList(args.tags)) - - ## add roles from command arguments - if args.roles: - for role in args.roles: - roleList.extend(role.split(',')) - - if roleList: - return buildPlaybook(roleList) - else: - return False - - - -def actionRun(args): - if args.playbook: - ## predefined playbook - playbook = args.playbook - else: - ## dynamic playbook - playbookContent = buildPlaybookFromArgs(args) - - if playbookContent: - f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) - f.write(playbookContent) - f.close() - playbook = f.name - else: - ## nothing to do - sys.exit(0) - - ## build ansible command with args - cmd = [ - 'ansible-playbook', - playbook, - '-i', 'localhost,', - '--connection=local', - ] - - if args.tags: - cmd.extend([ - '--tags=' + ','.join(args.tags) - ]) - - if args.args: - cmd.extend(args.args) - - ## run ansible - retval = call(cmd) - - ## cleanup dynamic playbook - if not args.playbook: - os.unlink(playbook) - - sys.exit(retval) - - - -def actionPlaybook(args): - playbook = buildPlaybookFromArgs(args) - - if playbook: - print playbook - else: - sys.exit(1) - - - -def actionList(args): - json = readJson() - list = {} - - for tag in args.tags: - if tag in json: - for role in json[tag]: - print role - - - -def actionAdd(args): - json = readJson() - - for tag in args.tags: - for role in args.role: - if tag not in json: - json[tag] = {} - - json[tag][role] = { - 'name': role, - 'added': int(time.time()), - 'priority': args.priority - } - - saveJson(json) - - - -def actionSummary(args): - # list all roles in each possible tag - for tag in PLAYBOOK_TAGS: - roleList = buildRoleList([tag]) - if roleList: - maxLength = len(max(roleList.keys(), key=len)) - - print "Roles in " + tag + ":" - for role in roleList: - print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' - print '' - - - -def main(args): - actions = { - 'list': actionList, - 'add': actionAdd, - 'summary': actionSummary, - 'playbook': actionPlaybook, - 'run': actionRun - } - - func = actions.get(args.action, lambda: "nothing") - return func(args) - - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - title='subcommands', - dest='action' - ) - - ################################### - ## SUMMARY command - summary = subparsers.add_parser('summary') - - ################################### - ## RUN command - run = subparsers.add_parser('run') - run.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - run.add_argument( - '--playbook', - dest='playbook', - help='Ansible playbook' - ) - run.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - run.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible role' - ) - run.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## PLAYBOOK command - playbook = subparsers.add_parser('playbook') - playbook.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - playbook.add_argument( - '--use-registry', - dest='useRegistry', - action='store_true', - help='Use registred roles' - ) - playbook.add_argument( - '--role', - dest='roles', - action='append', - help='Ansible tag' - ) - playbook.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## LIST command - list = subparsers.add_parser('list') - list.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - list.add_argument('args', nargs=argparse.REMAINDER) - - ################################### - ## ADD command - add = subparsers.add_parser('add') - add.add_argument( - '--tag', - dest='tags', - choices=PLAYBOOK_TAGS, - required=True, - action='append', - help='Ansible tag' - ) - add.add_argument( - '--priority', - type=int, - default=100, - dest='priority', - help='Priority for role [default 100, 1 is most important]' - ) - add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') - - add.add_argument('args', nargs=argparse.REMAINDER) - - ## Execute - args = parser.parse_args() - main(args) diff --git a/docker/php-official/8.0/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/cron.d/10-init.sh deleted file mode 100644 index 611edc9bf..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/cron.d/10-init.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Install crontab files - -if [[ -d "/opt/docker/etc/cron" ]]; then - mkdir -p /etc/cron.d/ - - find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do - # fix permissions - chmod 0644 -- "$CRONTAB_FILE" - - # add newline, cron needs this - echo >> "$CRONTAB_FILE" - - # Install files - cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" - done -fi diff --git a/docker/php-official/8.0/conf/bin/service.d/cron.sh b/docker/php-official/8.0/conf/bin/service.d/cron.sh deleted file mode 100644 index b5fa80dd3..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/cron.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/cron.d/" - -exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.0/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/dnsmasq.d/10-init.sh deleted file mode 100644 index 836ebe2b5..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/dnsmasq.d/10-init.sh +++ /dev/null @@ -1,37 +0,0 @@ -# Create dnsmasq.d directory if not exists -mkdir -p -- /etc/dnsmasq.d/ - -# Enable /etc/dnsmasq.d/ -go-replace --mode=lineinfile --once \ - -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ - -- /etc/dnsmasq.conf - -## clear dns file -echo > /etc/dnsmasq.d/webdevops.conf - -if [ ! -f /etc/resolv.conf.original ]; then - cp -a /etc/resolv.conf /etc/resolv.conf.original - - ## set forward servers - cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf - - ## set dnsmasq to main nameserver - echo "nameserver 127.0.0.1" > /etc/resolv.conf -fi - - -# Add own VIRTUAL_HOST as loopback -if [[ -n "${VIRTUAL_HOST+x}" ]]; then - # split comma by space - VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} - - # replace *.domain for dns specific .domain wildcard - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} - - # no support for .* - VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} - - for DOMAIN in $VIRTUAL_HOST_LIST; do - echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf - done -fi diff --git a/docker/php-official/8.0/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.0/conf/bin/service.d/dnsmasq.sh deleted file mode 100644 index b8b4c12e0..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/dnsmasq.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi -if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" - -exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/10-init.sh deleted file mode 100644 index 7d0dadad6..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/10-init.sh +++ /dev/null @@ -1,12 +0,0 @@ -# setup user env -FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" - -## Setup container uid -if [[ -n "$CONTAINER_UID" ]]; then - echo "Setting php-fpm user to $CONTAINER_UID" - go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ - -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -fi diff --git a/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh deleted file mode 100644 index ef6fd4016..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ /dev/null @@ -1,38 +0,0 @@ -# -# Workaround for old php-fpm versions which don't have clear_env setting -# - -VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" - -# For each exported variable -for envVariable in $(printenv|cut -f1 -d=); do - - case "$envVariable" in - "_"|"PATH"|"PWD") - ## ignore this variables - ;; - - *) - ## get content of variable - envVariableContent="${!envVariable}" - - ## php-fpm requires that env variable has to be filled with content - if [[ -n "$envVariableContent" ]]; then - ## quote quotes - envVariableContent=${envVariableContent//\"/\\\"} - - ## add to list - VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" - fi - ;; - esac - -done - -# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files -go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ - --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern='*.conf' \ - --ignore-empty - diff --git a/docker/php-official/8.0/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.0/conf/bin/service.d/php-fpm.sh deleted file mode 100644 index 15374f566..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/php-fpm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" - -exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.0/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/postfix.d/10-init.sh deleted file mode 100644 index 82574153d..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/postfix.d/10-init.sh +++ /dev/null @@ -1,30 +0,0 @@ -# force new copy of hosts there (otherwise links could be outdated) -mkdir -p /var/spool/postfix/etc -cp -f /etc/hosts /var/spool/postfix/etc/hosts -cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf -cp -f /etc/services /var/spool/postfix/etc/services - -go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" - -# General -go-replace --mode=lineinfile --regex \ - -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ - -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ - -- /etc/postfix/main.cf - -## REPLAYHOST -if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ - -- /etc/postfix/main.cf -fi - -## MYNETWORKS -if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then - go-replace --mode=lineinfile --regex \ - -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ - -- /etc/postfix/main.cf -fi - -# generate aliases db -newaliases || : diff --git a/docker/php-official/8.0/conf/bin/service.d/postfix.sh b/docker/php-official/8.0/conf/bin/service.d/postfix.sh deleted file mode 100644 index b9e477bcd..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/postfix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# postfix-wrapper.sh, version 0.1.0 -# -# You cannot start postfix in some foreground mode and -# it's more or less important that docker doesn't kill -# postfix and its chilren if you stop the container. -# -# Use this script with supervisord and it will take -# care about starting and stopping postfix correctly. -# -# supervisord config snippet for postfix-wrapper: -# -# [program:postfix] -# process_name = postfix -# command = /path/to/postfix-wrapper.sh -# startsecs = 0 -# autorestart = false -# - -# Init vars -if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi - -source /opt/docker/bin/config.sh - -trap "postfix stop" SIGINT -trap "postfix stop" SIGTERM -trap "postfix reload" SIGHUP - -includeScriptDir "/opt/docker/bin/service.d/postfix.d/" - -# start postfix -postfix start $SERVICE_POSTFIX_OPTS - -# lets give postfix some time to start -sleep 3 - -# wait until postfix is dead (triggered by trap) -if [[ -f /var/spool/postfix/pid/master.pid ]]; then - while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do - sleep 5 - done -fi diff --git a/docker/php-official/8.0/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index f2b600312..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Init ssh privilege separation directory -mkdir -p /var/run/sshd -chown root:root /var/run/sshd -chmod 755 /var/run/sshd - -# generate host keys -ssh-keygen -A diff --git a/docker/php-official/8.0/conf/bin/service.d/ssh.sh b/docker/php-official/8.0/conf/bin/service.d/ssh.sh deleted file mode 100644 index f01e87ab3..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/ssh.d/" - -exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.0/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/supervisor.d/10-init.sh deleted file mode 100644 index fdffa2a0f..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/supervisor.d/10-init.sh +++ /dev/null @@ -1 +0,0 @@ -# placeholder diff --git a/docker/php-official/8.0/conf/bin/service.d/supervisor.sh b/docker/php-official/8.0/conf/bin/service.d/supervisor.sh deleted file mode 100644 index 5a82a13ff..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/supervisor.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi -if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" - -exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.0/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.0/conf/bin/service.d/syslog-ng.d/10-init.sh deleted file mode 100644 index 326207e52..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/syslog-ng.d/10-init.sh +++ /dev/null @@ -1,10 +0,0 @@ -# If /dev/log is either a named pipe or it was placed there accidentally, -# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, -# then we remove it. -if [ ! -S /dev/log ]; then rm -f /dev/log; fi -if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi - -if [[ ! -p /docker.stdout ]]; then - # Switch to file (tty docker mode) - go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf -fi diff --git a/docker/php-official/8.0/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.0/conf/bin/service.d/syslog-ng.sh deleted file mode 100644 index 8e1358c1b..000000000 --- a/docker/php-official/8.0/conf/bin/service.d/syslog-ng.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Init vars -if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi - -source /opt/docker/bin/config.sh - -includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" - -exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.0/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.0/conf/bin/usr-bin/container-file-auto-restore deleted file mode 100644 index a41fcb3c8..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/container-file-auto-restore +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail ## trace ERR through pipes -set -o errtrace ## trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SOURCE_FILE="$1" -BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" - -if [[ -f "$BACKUP_FILE" ]]; then - ## Backup file exists - ## -> container was restarted - ## -> restoring configuration - cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" -else - ## Backup file DOESN'T exists - ## -> container first startup - ## -> backup configuration - cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" -fi diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.0/conf/bin/usr-bin/docker-ansible-install deleted file mode 100644 index dfb06fc7d..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-ansible-install +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install \ - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev - - chmod 750 /usr/local/bin/ansible* - ;; - - RedHat) - yum-install \ - epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel - easy_install pip - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - yum erase -y python-devel - - chmod 750 /usr/bin/ansible* - ;; - - Alpine) - apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko - pip install --upgrade pip - hash -r - pip install --no-cache-dir ansible - # Cleanup - apk del python-dev - - chmod 750 /usr/bin/ansible* - ;; -esac -docker-image-cleanup diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.0/conf/bin/usr-bin/docker-cronjob deleted file mode 100644 index 2746c75f5..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-cronjob +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -source /opt/docker/bin/config.sh - -rootCheck "$0" - -if [[ "$#" -eq 0 ]]; then - echo "Usage: $0 ''" - exit 1 -fi - -# create crontab file -touch /etc/cron.d/webdevops-docker -chmod 0644 /etc/cron.d/webdevops-docker - -for CRONJOB_LINES in "$@"; do - echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker -done - -# Add required newline at end -echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.0/conf/bin/usr-bin/docker-php-setting deleted file mode 100644 index 30bbb979f..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-php-setting +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Defaults -PHP_INI_FILE="/opt/docker/etc/php/php.ini" -PHP_VALUE_RAW=0 -PHP_KEY= -PHP_VALUE= - -for arg in "$@"; do - case "$arg" in - --raw) - PHP_VALUE_RAW=1 - shift - ;; - esac -done - -if [[ "$#" -le 2 ]]; then - echo "Usage: $(basename "$0") [--raw] " - exit 1 -fi - -PHP_SETTING_KEY=$1 -shift -PHP_SETTING_VALUE="$@" - -if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then - case "$PHP_SETTING_VALUE" in - ''|*[!0-9]*) - # non numeric - PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" - ;; - esac -fi - - -echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" -echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" - diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-provision b/docker/php-official/8.0/conf/bin/usr-bin/docker-provision deleted file mode 100644 index 4ee715c64..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-provision +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# wrapper -exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-service b/docker/php-official/8.0/conf/bin/usr-bin/docker-service deleted file mode 100644 index 70a493767..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-service +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -if [[ "$#" -le 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -SERVICE_COMMAND=$1 -shift - -for SERVICE in "$@"; do - RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" - SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" - PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" - - case "$SERVICE_COMMAND" in - enable) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - ## Enable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - disable) - ## Disable service - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=lineinfile \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" - exit 1 - fi - ;; - - install) - # Run on demand installation/provisioning - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for ${SERVICE}, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - ;; - - run) - if [[ -f "$RUN_FILE" ]]; then - exec "$RUN_FILE" - else - echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" - exit 1 - fi - ;; - - stop|start|restart|status|pid|check) - service "${SERVICE}" "$SERVICE_COMMAND" - ;; - - *) - echo "[ERROR] $SERVICE_COMMAND is not a valid command" - exit 1 - ;; - esac -done - diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.0/conf/bin/usr-bin/docker-service-disable deleted file mode 100644 index 991f249c8..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-service-disable +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service disable "$@" diff --git a/docker/php-official/8.0/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.0/conf/bin/usr-bin/docker-service-enable deleted file mode 100644 index da99c9aeb..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/docker-service-enable +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -exec docker-service enable "$@" - diff --git a/docker/php-official/8.0/conf/bin/usr-bin/service b/docker/php-official/8.0/conf/bin/usr-bin/service deleted file mode 100755 index 69874cb80..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/docker/php-official/8.0/conf/bin/usr-bin/version-compare b/docker/php-official/8.0/conf/bin/usr-bin/version-compare deleted file mode 100644 index ca450b0e9..000000000 --- a/docker/php-official/8.0/conf/bin/usr-bin/version-compare +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -function versionCompare () { - if [[ $1 == $2 ]] - then - echo -n '=' - return - fi - local IFS=. - local i ver1=($1) ver2=($2) - # fill empty fields in ver1 with zeros - for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) - do - ver1[i]=0 - done - for ((i=0; i<${#ver1[@]}; i++)) - do - if [[ -z ${ver2[i]} ]] - then - # fill empty fields in ver2 with zeros - ver2[i]=0 - fi - if ((10#${ver1[i]} > 10#${ver2[i]})) - then - echo -n '>' - return - fi - if ((10#${ver1[i]} < 10#${ver2[i]})) - then - echo -n '<' - return - fi - done - - echo -n '=' -} - -versionCompare "$1" "$2" diff --git a/docker/php-official/8.0/conf/etc/cron/.gitkeep b/docker/php-official/8.0/conf/etc/cron/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.0/conf/etc/logrotate.d/php5-fpm deleted file mode 100644 index e6ef4b123..000000000 --- a/docker/php-official/8.0/conf/etc/logrotate.d/php5-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php5-fpm/fpm.log -/var/log/php5-fpm/access.log -/var/log/php5-fpm/slow.log -/var/log/php5-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php-official/8.0/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.0/conf/etc/logrotate.d/syslog-ng deleted file mode 100644 index 4a6f9c54e..000000000 --- a/docker/php-official/8.0/conf/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,38 +0,0 @@ -/var/log/syslog -{ - rotate 7 - daily - missingok - notifempty - delaycompress - compress - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - endscript -} - -/var/log/mail.info -/var/log/mail.warn -/var/log/mail.err -/var/log/mail.log -/var/log/daemon.log -/var/log/kern.log -/var/log/auth.log -/var/log/user.log -/var/log/lpr.log -/var/log/cron.log -/var/log/debug -/var/log/messages -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null - supervisorctl restart syslog-ng-stdout > /dev/null - endscript -} \ No newline at end of file diff --git a/docker/php-official/8.0/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.0/conf/etc/php/conf.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.0/conf/etc/php/fpm/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/etc/php/php.ini b/docker/php-official/8.0/conf/etc/php/php.ini deleted file mode 100644 index 447212118..000000000 --- a/docker/php-official/8.0/conf/etc/php/php.ini +++ /dev/null @@ -1 +0,0 @@ -; placeholder diff --git a/docker/php-official/8.0/conf/etc/php/php.webdevops.ini b/docker/php-official/8.0/conf/etc/php/php.webdevops.ini deleted file mode 100644 index aa1545ab8..000000000 --- a/docker/php-official/8.0/conf/etc/php/php.webdevops.ini +++ /dev/null @@ -1,34 +0,0 @@ -; ------------------------------------- -; Docker Webdevops PHP configuration -; ------------------------------------- - -; this file will overwrite default php.ini settings - -display_errors = 0 -log_errors = 1 - -short_open_tag = Off -variables_order = 'GPCS' -request_order = 'GP' - -allow_url_fopen = On -allow_url_include = Off - -memory_limit = 512M -max_execution_time = 300 -max_input_time = 300 -post_max_size = 50M -upload_max_filesize = 50M -max_input_vars = 5000 - -expose_php = Off - -date.timezone = UTC - -mysql.default_host = mysql -mysqli.default_host = mysql - -opcache.memory_consumption = 256 -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 7963 -opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.0/conf/etc/supervisor.conf b/docker/php-official/8.0/conf/etc/supervisor.conf deleted file mode 100644 index 479e0db08..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.conf +++ /dev/null @@ -1,20 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /.supervisor.sock -chmod = 0700 -chown = root:root -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///.supervisor.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.0/conf/etc/supervisor.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.0/conf/etc/supervisor.d/cron.conf deleted file mode 100644 index ef0a71678..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/cron.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:cron] -programs=crond -priority=25 - -[program:crond] -command = /opt/docker/bin/service.d/cron.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.0/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index 9832ffca7..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.0/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 5781f5b0a..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:php-fpm] -programs=php-fpmd -priority=20 - -[program:php-fpmd] -command = /opt/docker/bin/service.d/php-fpm.sh -process_name=%(program_name)s -startsecs = 0 -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.0/conf/etc/supervisor.d/postfix.conf deleted file mode 100644 index b8d70bb40..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/postfix.conf +++ /dev/null @@ -1,15 +0,0 @@ -[group:postfix] -programs=postfixd -priority=30 - -[program:postfixd] -directory = /etc/postfix -command = /opt/docker/bin/service.d/postfix.sh -process_name=%(program_name)s -startsecs = 0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.0/conf/etc/supervisor.d/ssh.conf deleted file mode 100644 index 0ecd798d6..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/ssh.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:ssh] -programs=sshd -priority=30 - -[program:sshd] -command = /opt/docker/bin/service.d/ssh.sh -process_name=%(program_name)s -startsecs=0 -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.0/conf/etc/supervisor.d/syslog.conf deleted file mode 100644 index 20d1e238c..000000000 --- a/docker/php-official/8.0/conf/etc/supervisor.d/syslog.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = false -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.0/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.0/conf/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index c69841581..000000000 --- a/docker/php-official/8.0/conf/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,48 +0,0 @@ -@version: 3.5 - -template t_isostamp { - # syslog-t_isostamp START - template("[SYSLOG] $MSGHDR$MSG\n"); - # syslog-t_isostamp END -}; - -options { - # syslog-options START - file-template(t_isostamp); - chain_hostnames(off); - flush_lines(0); - use-dns(no); - use_fqdn(no); - owner("root"); - group("adm"); - perm(0640); - stats_freq(0); - # syslog-options START -}; - -source s_src { - # syslog-s_src START - unix-stream("/dev/log"); - internal(); - # syslog-s_src END -}; - -filter f_filter { - # syslog-f_filter START - not facility(auth, authpriv); - # syslog-f_filter END -}; - -destination d_all { - # syslog-d_all START - pipe("/docker.stdout"); - # syslog-d_all END -}; - -log { - # syslog-log START - source(s_src); - filter(f_filter); - destination(d_all); - # syslog-log START -}; diff --git a/docker/php-official/8.0/conf/provision/ansible.cfg b/docker/php-official/8.0/conf/provision/ansible.cfg deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.0/conf/provision/bootstrap.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/10-entrypoint.sh deleted file mode 100644 index 413e7b37c..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/10-entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Link main entrypoint script to /entrypoint -ln -sf /opt/docker/bin/entrypoint.sh /entrypoint - -# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd -ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd - -# Create /entrypoint.d -mkdir -p /entrypoint.d -chmod 700 /entrypoint.d -chown root:root /entrypoint.d - - diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/10-permissions.sh deleted file mode 100644 index 20d602bdd..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/10-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash - diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/10-php-init.sh deleted file mode 100644 index db0141b8f..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/10-php-init.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) -IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/10-supervisor.sh deleted file mode 100644 index 311daee4c..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/10-supervisor.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Remove /usr/sbin/service (images have custom service script) -rm -rf /usr/sbin/service - -# Remove existing supervisor configuration -rm -rf -- /etc/supervisor* - -# Link supervisor configuration script -ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/10-user-application.sh deleted file mode 100644 index 5bc865e80..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/10-user-application.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Add group -groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" - -# Add user -useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" - -# Assign user to group -usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/11-php-conf.sh deleted file mode 100644 index ee56ccaae..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/11-php-conf.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -PHP_CLEAR_ENV_AVAILABLE=1 - -PHP_ETC_DIR=/usr/local/etc/php -PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf -PHP_POOL_CONF=www.conf -PHP_POOL_DIR=/usr/local/etc/php-fpm.d -PHP_FPM_BIN=/usr/local/sbin/php-fpm -PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/20-app.sh deleted file mode 100644 index 749966b67..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/20-app.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -# Create /app folder -mkdir -p /app -chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh deleted file mode 100644 index 121788e60..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# Rename pool file file to application.conf -if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then - # Move php-fpm pool directory file to /opt/docker/etc/php/ - mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d - - mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Remove php-fpm pool directory -rm -rf -- "$PHP_POOL_DIR" - -# Symlink php-fpm pool file to original destination -ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" - -# Configure php-fpm pool (application.conf) -go-replace --mode=lineinfile --regex \ - -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ - -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ - -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ - -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ - -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ - -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - -# Fix user setting -go-replace --mode=line --regex \ - -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ - -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then - # Clear env setting available, disable clearing of environment variables - go-replace --mode=lineinfile --regex \ - -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ - -- /opt/docker/etc/php/fpm/pool.d/application.conf - rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh -else - # Append clear env workaround in php-fpm pool (old php-fpm versions) - echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -fi diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh deleted file mode 100644 index 873ddf608..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Link main php-fpm binary -ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm - -# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink -if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then - mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf -else - rm -f -- "PHP_MAIN_CONF" -fi -ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" - -# Configure php-fpm main (all versions) -go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ - -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then - # listen on public IPv4 port - # no ipv6 sockets available for old php version - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' -else - # listen on public IPv6 port - go-replace --mode=line --regex \ - -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ - --path=/opt/docker/etc/php/fpm/ \ - --path-pattern='*.conf' - -fi - -if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then - # Configure php-fpm main (php 5.x) - go-replace --mode=lineinfile --regex \ - --lineinfile-after='\[global\]' \ - -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ - -- /opt/docker/etc/php/fpm/php-fpm.conf -fi diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php.sh deleted file mode 100644 index c1e716300..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/20-setup-php.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Register webdevops ini - ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" - - # Register custom php ini - ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" - ;; -esac diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 4a348a38a..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/30-setup-ioncube.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -if [ $IMAGE_FAMILY == "Alpine" ]; then - echo "Skipping ionCube installation on Alpine" - return -fi - -echo "Installing ionCube loader" - -DOWNLOAD_URL="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" -TMP_FILE="/tmp/ioncube_loaders.tar.gz" - -echo "Downloading ..." -curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} -echo "Unpacking ..." -tar -xzf ${TMP_FILE} -C /tmp - -PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` -PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` -MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" -SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" - -echo "PHP-VERSION: ${PHP_VERSION}" -echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" -if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then - echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" -else - echo "Installing ${SO_FILE}" - cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} - - echo "Writing module ini" - echo "[ioncube]" > ${MOD_INI} - echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} - echo "; priority=01" >> ${MOD_INI} - - echo "Cleaning up" - rm -rf $TMP_FILE - rm -rf /tmp/ioncube - - echo "Enabling ionCube PHP module" - case "$IMAGE_FAMILY" in - Debian|Ubuntu) - # Enable ionCube (if available) - if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" - ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" - fi - ;; - esac -fi diff --git a/docker/php-official/8.0/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.0/conf/provision/bootstrap.d/90-cleanup.sh deleted file mode 100644 index 3ca393da6..000000000 --- a/docker/php-official/8.0/conf/provision/bootstrap.d/90-cleanup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Remove default cronjobs -rm -f -- \ - /etc/cron.daily/logrotate \ - /etc/cron.daily/apt-compat \ - /etc/cron.daily/dpkg \ - /etc/cron.daily/passwd \ - /etc/cron.daily/0yum-daily.cron \ - /etc/cron.daily/logrotate \ - /etc/cron.hourly/0yum-hourly.cron \ - /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.0/conf/provision/build.d/.gitkeep b/docker/php-official/8.0/conf/provision/build.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.0/conf/provision/build.d/10-cleanup.sh deleted file mode 100644 index 41031b784..000000000 --- a/docker/php-official/8.0/conf/provision/build.d/10-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -## remove logs (each bootstrap) -rm -rf -- /var/log/* -rm -rf -- /var/tmp/* -rm -rf -- /tmp/* -rm -rf -- /root/.profile diff --git a/docker/php-official/8.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.0/conf/provision/entrypoint.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.0/conf/provision/entrypoint.d/05-permissions.sh deleted file mode 100644 index 6f77d8e40..000000000 --- a/docker/php-official/8.0/conf/provision/entrypoint.d/05-permissions.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Fix rights of /tmp (can be a volume) -chmod 1777 /tmp diff --git a/docker/php-official/8.0/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.0/conf/provision/entrypoint.d/20-php-fpm.sh deleted file mode 100644 index 5ab722cf7..000000000 --- a/docker/php-official/8.0/conf/provision/entrypoint.d/20-php-fpm.sh +++ /dev/null @@ -1,80 +0,0 @@ -####################################### -### FPM MAIN -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" - -echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf -echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf - -if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then - echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf -fi - -# General fpm main setting -for ENV_VAR in $(envListVars "fpm\.global\."); do - env_key=${ENV_VAR#fpm.global.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf -done - -####################################### -### FPM POOL -####################################### - -container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" - -echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf -echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf - -# General fpm pool setting -for ENV_VAR in $(envListVars "fpm\.pool\."); do - env_key=${ENV_VAR#fpm.pool.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -done - - -if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then - echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then - echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then - echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then - echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then - echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then - echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then - echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then - echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then - echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf -fi diff --git a/docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh deleted file mode 100644 index 2e208fb85..000000000 --- a/docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh +++ /dev/null @@ -1,75 +0,0 @@ -container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" - -echo '' >> /opt/docker/etc/php/php.webdevops.ini -echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini - -# General php setting -for ENV_VAR in $(envListVars "php\."); do - env_key=${ENV_VAR#php.} - env_val=$(envGetValue "$ENV_VAR") - - echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini -done - - -if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then - echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then - echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then - echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then - echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then - echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then - echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then - echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then - echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then - echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then - echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then - echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Workaround for official PHP images -if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then - echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini -fi - -# Disable all PHP mods specified in PHP_DISMOD as comma separated list -if [[ -n "${PHP_DISMOD+x}" ]]; then - ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) - for DISABLE_MOD in ${PHP_DISMOD//,/ }; do - rm -f ${ini_dir_cli}/*${DISABLE_MOD}* - rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* - done -fi - -# Link composer version accordingly -ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.0/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.0/conf/provision/onbuild.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/roles/.gitkeep b/docker/php-official/8.0/conf/provision/roles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/service.d/.gitkeep b/docker/php-official/8.0/conf/provision/service.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/docker/php-official/8.0/conf/provision/service.d/cron.sh b/docker/php-official/8.0/conf/provision/service.d/cron.sh deleted file mode 100644 index bd8a54781..000000000 --- a/docker/php-official/8.0/conf/provision/service.d/cron.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install cron - ;; - - RedHat) - yum-install cronie - ;; -esac diff --git a/docker/php-official/8.0/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.0/conf/provision/service.d/dnsmasq.sh deleted file mode 100644 index 9e5c3228c..000000000 --- a/docker/php-official/8.0/conf/provision/service.d/dnsmasq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install dnsmasq - ;; - - RedHat) - yum-install dnsmasq - ;; - - Alpine) - apk-install dnsmasq - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*user[\s]*=' -r 'user = root' \ - -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ - -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.0/conf/provision/service.d/postfix.sh b/docker/php-official/8.0/conf/provision/service.d/postfix.sh deleted file mode 100644 index a8c7cc61b..000000000 --- a/docker/php-official/8.0/conf/provision/service.d/postfix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install postfix - ;; - - RedHat) - yum-install postfix - - # Fix mysql lib - if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then - ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 - fi - ;; - - Alpine) - apk-install postfix - ;; -esac - -# Configuration -go-replace --mode=line \ - -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ - -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ - -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ - -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ - -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ - -- /etc/postfix/main.cf diff --git a/docker/php-official/8.0/conf/provision/service.d/ssh.sh b/docker/php-official/8.0/conf/provision/service.d/ssh.sh deleted file mode 100644 index 63d7a9f3a..000000000 --- a/docker/php-official/8.0/conf/provision/service.d/ssh.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install openssh-server - ;; - - RedHat) - yum-install openssh-server - ;; - - Alpine) - apk-install openssh - ;; -esac diff --git a/docker/php-official/8.0/conf/provision/service.d/syslog.sh b/docker/php-official/8.0/conf/provision/service.d/syslog.sh deleted file mode 100644 index 675d0b061..000000000 --- a/docker/php-official/8.0/conf/provision/service.d/syslog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -IMAGE_FAMILY=$(docker-image-info family) - -# Installation -case "$IMAGE_FAMILY" in - Debian|Ubuntu) - apt-install syslog-ng syslog-ng-core - ;; - - RedHat) - yum-install syslog-ng - - # remove logrotate (not needed for docker) - rm -f "/etc/cron.daily/logrotate" - ;; - - Alpine) - apk-install syslog-ng - ;; -esac - -## Configuration -SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) - -# Disable caps inside container -if [[ -f /etc/default/syslog-ng ]]; then - go-replace --mode=lineinfile \ - -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ - -- /etc/default/syslog-ng -fi - -# Symlink configuration -ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf - -go-replace --mode=lineinfile \ - -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ - -- /etc/syslog-ng/syslog-ng.conf - -# Ensure /var/lib/syslog-ng exists -mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.0/conf/provision/variables-webdevops.yml b/docker/php-official/8.0/conf/provision/variables-webdevops.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.0/conf/provision/variables-webdevops.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.0/conf/provision/variables.yml b/docker/php-official/8.0/conf/provision/variables.yml deleted file mode 100644 index 0b2a21a95..000000000 --- a/docker/php-official/8.0/conf/provision/variables.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" -docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" -docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" -docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" -docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index a7af18f09..75a8cace3 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -189,7 +189,7 @@ RUN set -x \ && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ - && pecl install protobuf \ + && pecl install protobuf-4.33.5 \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index e11eaef89..24be23a39 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -178,7 +178,7 @@ RUN set -x \ && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ - && pecl install protobuf \ + && pecl install protobuf-4.33.5 \ && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ diff --git a/docker/php/5.6 b/docker/php/5.6 deleted file mode 120000 index a857368d6..000000000 --- a/docker/php/5.6 +++ /dev/null @@ -1 +0,0 @@ -../php-official/5.6 \ No newline at end of file diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index c1991d6b0..3d0f56558 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -65,31 +65,20 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ -{%- else %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ -{%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ -{%- endif %} && docker-php-ext-configure ldap \ {%- if version != '8.4' and version != '8.5' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ {%- endif %} && docker-php-ext-install \ bcmath \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} amqp \ -{%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} imagick \ ffi \ -{%- endif %} bz2 \ calendar \ exif \ @@ -99,14 +88,8 @@ gettext \ ldap \ mysqli \ -{%- if version|int == 5 or version == '7.0' or version == '7.1' %} - mcrypt \ -{%- endif %} {%- if version != '8.4' and version != '8.5' %} imap \ -{%- endif %} -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - hash \ {%- endif %} pcntl \ pdo_mysql \ @@ -114,40 +97,25 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - tokenizer \ -{%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - xmlrpc \ -{%- endif %} xsl \ zip \ gd \ {%- if version != '8.5' %} opcache \ {%- endif %} -{%- if version|int == 5 %} - # Install extensions for PHP 5.x - && pecl install apcu-4.0.11 \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached-2.2.0 \ - && pecl install redis-4.3.0 \ - && pecl install mongodb \ - && pecl install imagick \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ -{%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install memcached \ && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ +{%- if version == '8.1' %} + && pecl install protobuf-4.33.5 \ +{%- else %} && pecl install protobuf \ +{%- endif %} && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ @@ -161,24 +129,6 @@ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ -{%- else %} - # Install extensions for PHP 7.x - && pecl install apcu \ - && printf "no --disable-memcached-sasl\n" | pecl install memcached \ - && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ - # Install vips (only works with PHP >= 7.0) - && printf "\n" | pecl install vips \ - && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - && pecl install redis \ - && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ - && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ - && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ - && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ - && echo extension=amqp.so > /usr/local/etc/php/conf.d/amqp.ini \ -{%- endif %} # Uninstall dev and header packages && apt-get purge -y -f --force-yes \ libc-client-dev \ @@ -251,10 +201,10 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - {%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} - samba-dev \ - {%- else %} + {%- if version == '8.1' %} ldb-dev \ + {%- else %} + samba-dev \ {%- endif %} pcre-dev \ libxslt-dev \ @@ -273,16 +223,11 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ -{%- else %} - && docker-php-ext-configure intl --with-icu-dir=/usr/local \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ -{%- endif %} && docker-php-ext-configure ldap \ {%- if version != '8.4' and version != '8.5' %} && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ @@ -294,22 +239,15 @@ exif \ ftp \ gmp \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} ffi \ imagick \ -{%- endif %} -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} amqp \ -{%- endif %} intl \ gettext \ ldap \ mysqli \ {%- if version != '8.4' and version != '8.5' %} imap \ -{%- endif %} -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - hash \ {%- endif %} pcntl \ pdo_mysql \ @@ -317,16 +255,10 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - tokenizer \ -{%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' and version != '8.5' %} - xmlrpc \ -{%- endif %} xsl \ zip \ gd \ @@ -334,22 +266,20 @@ opcache \ {%- endif %} # Install extensions for PHP 7.x - {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ && docker-php-ext-configure $MEMCACHED \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ - {%- else %} - && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ - && docker-php-ext-enable memcached \ - {%- endif %} -{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} && pecl install apcu \ && pecl install excimer \ && pecl install opentelemetry \ +{%- if version == '8.1' %} + && pecl install protobuf-4.33.5 \ +{%- else %} && pecl install protobuf \ +{%- endif %} && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -366,25 +296,6 @@ xmlrpc \ imagick \ mongodb \ -{%- else %} - # Install vips (only works with PHP >= 7.0) - && pecl install apcu \ - && printf "\n" | pecl install vips \ - && pecl install redis \ - && pecl install mongodb \ - {%- if version != '7.4' %} - && pecl install imagick \ - && pecl install amqp \ - {%- endif %} - && pecl install yaml \ - && docker-php-ext-enable \ - apcu \ - redis \ - mongodb \ - amqp \ - vips \ - yaml \ -{%- endif %} # Uninstall dev and header packages && apk del -f --purge \ autoconf \ @@ -408,10 +319,10 @@ icu-dev \ postgresql-dev \ libxml2-dev \ - {%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} - samba-dev \ - {%- else %} + {%- if version == '8.1' %} ldb-dev \ + {%- else %} + samba-dev \ {%- endif %} pcre-dev \ libxslt-dev \ @@ -432,17 +343,7 @@ && echo 'deb https://packages.tideways.com/apt-packages-main any-version main' | tee /etc/apt/sources.list.d/tideways.list \ && wget -qO - https://packages.tideways.com/key.gpg | apt-key add - \ && apt-install tideways-php tideways-daemon \ - {%- if version|int == 5 %} - && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %} - && pecl install xdebug \ - {%- elif version == '7.0' or version == '7.1' %} - && pecl install xdebug-2.8.1 \ - {%- elif version == '7.4' %} - && pecl install xdebug-3.1.6 \ - {%- else %} && pecl install xdebug \ - {%- endif %} && docker-php-ext-enable xdebug \ {{ services.phpDev() }} {%- endmacro %} @@ -456,20 +357,7 @@ make \ autoconf \ g++ \ - {%- if version|int == 5 %} - && pecl install xdebug-2.5.5 \ - {%- elif version == '7.0' or version == '7.1' %} - && pecl install xdebug-2.8.1 \ - {%- elif version == '8.5' %} - && wget https://github.com/php/pie/releases/download/1.3.1/pie.phar -O /usr/local/bin/pie \ - && chmod +x /usr/local/bin/pie \ - && pie install xdebug/xdebug:^3.5.0@alpha \ - && rm -f /usr/local/bin/pie \ - {%- elif version == '7.4' %} - && pecl install xdebug-3.1.6 \ - {%- else %} && pecl install xdebug \ - {%- endif %} && apk del -f --purge \ autoconf \ linux-headers \ From 542ee906cbd61acc2e3b099b5f4588edbf1c7d8c Mon Sep 17 00:00:00 2001 From: Pepijn Olivier Date: Thu, 26 Mar 2026 14:40:18 +0100 Subject: [PATCH 63/63] Update info-php-development.rst fix typo --- .../DockerImages/dockerfiles/include/info-php-development.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst index e5283c72f..a16399828 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/info-php-development.rst @@ -1,3 +1,3 @@ .. attention:: PHP is running in development mode. Zend Opcode Cache is set to to revalidate files for best development experience. -.. tip:: PHP-FPM is accessable by public port 9000 +.. tip:: PHP-FPM is accessible by public port 9000